aboutsummaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-09-16 17:18:17 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-09-16 17:57:14 +0200
commit90cd9b2c1ddefffa6a02addbc24718fd2e9bf3d7 (patch)
tree5101a1a83ae69b7bc78bc177ad7f1652e0555be2 /mcp
parent09ec1e9cc02268c45d5cfd5a289b53a52d9c6e94 (diff)
docker-compose: Align hosts with hostnamestable/hunter
When using Docker CE 19.x, `hostname -d` fails to properly resolve the domainname due to changes in the way Docker sets it inside the container. Work around this issue by aligning the contents of `/etc/hostname` with `/etc/hosts`, so `hostname -d` can properly determine the domain name. This also requires calling `hostname -b` via cfg01 entrypoint.sh. Change-Id: I697b5d9882e3d6641712a00bca10012800ee1898 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/scripts/.gitignore1
-rwxr-xr-xmcp/scripts/docker-compose/files/entrypoint.sh5
-rw-r--r--mcp/scripts/docker-compose/files/hosts.j2 (renamed from mcp/scripts/docker-compose/files/hosts)1
3 files changed, 7 insertions, 0 deletions
diff --git a/mcp/scripts/.gitignore b/mcp/scripts/.gitignore
index c21c3d9de..d89d60722 100644
--- a/mcp/scripts/.gitignore
+++ b/mcp/scripts/.gitignore
@@ -2,3 +2,4 @@ mcp.rsa*
user-data.sh
xdf_data.sh
docker-compose/files/entrypoint_maas.sh
+docker-compose/files/hosts
diff --git a/mcp/scripts/docker-compose/files/entrypoint.sh b/mcp/scripts/docker-compose/files/entrypoint.sh
index b50dd2761..caa50a998 100755
--- a/mcp/scripts/docker-compose/files/entrypoint.sh
+++ b/mcp/scripts/docker-compose/files/entrypoint.sh
@@ -89,6 +89,11 @@ find -L /srv/salt /srv/salt/env/prd/_* -maxdepth 1 -type l -delete
# Fix up any permissions after above file shuffling
chown root:root -R /srv/salt
+# Docker-ce 19.x+ workaround for broken domainname setup
+# shellcheck source=/dev/null
+source /root/fuel/mcp/scripts/xdf_data.sh
+hostname -b "cfg01.${CLUSTER_DOMAIN}"
+
service ssh start
service salt-minion start
diff --git a/mcp/scripts/docker-compose/files/hosts b/mcp/scripts/docker-compose/files/hosts.j2
index 473184145..b42c5a088 100644
--- a/mcp/scripts/docker-compose/files/hosts
+++ b/mcp/scripts/docker-compose/files/hosts.j2
@@ -1,3 +1,4 @@
+{{ conf.SALT_MASTER }} cfg01.{{ conf.cluster.domain }}
127.0.0.1 localhost
::1 localhost ip6-localhost ip6-loopback
fe00::0 ip6-localnet