From 4e8d5aa2c3bc7e811d2592856549faf809143971 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 14 Dec 2016 15:48:07 -0500 Subject: Use hostname -s instead of hostnamectl --transient This patch updates the deployed-server interface to use a simple hostname -s. The previous hostnamectl --transient can pick up extra domain name configuration in some cases that can cause very odd hostname generation if used with the tripleo-heat-template host file generation. This would actually break the new undercloud t-h-t installer in that some of the /etc/hosts entries would be invalid (no IP address) due to substring replacements failing in a variety of odd hostname situations. Simplifying the hostname of deployed servers to just the short version seems the most sensable way to avoid all this. Change-Id: Ia7e636d021f948ea5234475cef02f666d8ce6999 --- deployed-server/deployed-server.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deployed-server') diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 22797c2e..4f8c1c75 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -69,7 +69,7 @@ resources: #!/bin/bash set -eux mkdir -p $heat_outputs_path - host=$(hostnamectl --transient) + host=$(hostname -s) echo -n $host > $heat_outputs_path.hostname cat $heat_outputs_path.hostname outputs: -- cgit 1.2.3-korg