From f2ca8e7dba0c63c6da49b643385a4a1bc60f54d6 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 11 Sep 2019 14:46:26 +0200
Subject: [PATCH] Fix CI hostname
---
.gitlab-ci.yml | 8 ++++----
ansible/group_vars/all/oas.yml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12925a95f..9bfc588c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,11 +9,11 @@ stages:
image: "${CI_REGISTRY_IMAGE}/openappstack-ci:${CI_COMMIT_REF_NAME}"
variables:
SSH_KEY_ID: "411"
- HOSTNAME: "ci-$CI_PIPELINE_ID"
+ HOSTNAME: "ci-${CI_PIPELINE_ID}"
# Repeated values, because we're not allowed to use a variable in a variable
- SUBDOMAIN: "ci-$CI_PIPELINE_ID.ci"
+ SUBDOMAIN: "ci-${CI_PIPELINE_ID}.ci"
DOMAIN: "openappstack.net"
- ADDRESS: "ci-$CI_PIPELINE_ID.ci.openappstack.net"
+ ADDRESS: "ci-${CI_PIPELINE_ID}.ci.openappstack.net"
ci_test_image:
stage: build
@@ -40,7 +40,7 @@ bootstrap:
- chmod 755 ansible/
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
- - echo "subdomain $SUBDOMAIN, domain $DOMAIN, address $ADDRESS"
+ - echo "hostname $HOSTNAME, subdomain $SUBDOMAIN, domain $DOMAIN, address $ADDRESS"
- python3 -m openappstack $HOSTNAME create --create-droplet $DOMAIN --hostname $HOSTNAME --ssh-key-id $SSH_KEY_ID --create-domain-records --subdomain $SUBDOMAIN
- export ANSIBLE_HOST_KEY_CHECKING=False
- mkdir -p ~/.ssh/ && echo ssh-keyscan -t ssh-ed25519 "$ADDRESS" > ~/.ssh/known_hosts
diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index f6bf5d330..ebfb7e4fd 100644
--- a/ansible/group_vars/all/oas.yml
+++ b/ansible/group_vars/all/oas.yml
@@ -9,7 +9,7 @@ log_directory: "/var/log/OpenAppStack"
ansible_python_interpreter: "/usr/bin/env python3"
# Nextcloud administrator password. If you do not change this value, it gets
-# generated and stored in `{{ secret_directory }}/nextcloud_admin_password`.
+# generated and stored in the configured `cluster_dir` under `secrets/nextcloud_admin_password`.
# You can also choose your own password and fill it in here instead.
nextcloud_password: "{{ lookup('password', '../{{ cluster_dir }}/secrets/nextcloud_admin_password chars=ascii_letters') }}"
nextcloud_mariadb_password: "{{ lookup('password', '../{{ cluster_dir }}/secrets/nextcloud_mariadb_password chars=ascii_letters') }}"
--
GitLab