summaryrefslogtreecommitdiffstats
path: root/deployed-server
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-12-14 15:48:07 -0500
committerDan Prince <dprince@redhat.com>2016-12-14 15:48:07 -0500
commit4e8d5aa2c3bc7e811d2592856549faf809143971 (patch)
tree6a8162f7a30015c77b6a8a801146e5979a97f0a6 /deployed-server
parent1e88f875239b30de24552450b623e6892941fa1e (diff)
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
Diffstat (limited to 'deployed-server')
-rw-r--r--deployed-server/deployed-server.yaml2
1 files changed, 1 insertions, 1 deletions
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: