Use FQDN for ssh

Fixes: #809

.gitlab-ci.yml

@@ -164,8 +164,6 @@ variables:
   SSH_KEY_ID: "411"
   HOSTNAME: "${CI_COMMIT_REF_SLUG}"
   # Repeated values, because we're not allowed to use a variable in a variable
-  SUBDOMAIN: "${CI_COMMIT_REF_SLUG}.ci"
-  DOMAIN: "openappstack.net"
   ANSIBLE_HOST_KEY_CHECKING: "False"
   KANIKO_BUILD_IMAGENAME: "openappstack-ci"
   CLUSTER_DIR: "/builds/openappstack/openappstack/clusters/${CI_COMMIT_REF_SLUG}"
@@ -306,9 +304,9 @@ setup-openappstack:
     # Set up cluster
     # TODO: I set --no-install-openappstack to skip the old installation procedure, should be removed eventually
     - python3 -m openappstack $HOSTNAME install --install-kubernetes --no-install-openappstack
-    - scp -r ./install root@${SUBDOMAIN}.${DOMAIN}:/tmp/install
-    - ssh ${SUBDOMAIN}.${DOMAIN} -l root "/usr/bin/env /tmp/install/ci-write-variable-files.sh $IP_ADDRESS ${SUBDOMAIN}.${DOMAIN}"
-    - ssh ${SUBDOMAIN}.${DOMAIN} -l root "/usr/bin/env /tmp/install/install-openappstack.sh"
+    - scp -r ./install root@${FQDN}:/tmp/install
+    - ssh ${FQDN} -l root "/usr/bin/env /tmp/install/ci-write-variable-files.sh $IP_ADDRESS ${SUBDOMAIN}.${DOMAIN}"
+    - ssh ${FQDN} -l root "/usr/bin/env /tmp/install/install-openappstack.sh"
     # TODO: Should also be removed or made up-to-date
     # Show versions of installed apps/binaries
     # - cd ansible
@@ -426,7 +424,7 @@ single-sign-on-helm-release:
   stage: install-apps
   script:
     - *debug_information
-    - ssh ${SUBDOMAIN}.${DOMAIN} -l root "/usr/bin/env /tmp/install/install-${APP}.sh"
+    - ssh ${FQDN} -l root "/usr/bin/env /tmp/install/install-${APP}.sh"
   extends:
     - .ssh_setup
   interruptible: true