summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-05 14:14:48 +0000
committerGerrit Code Review <review@openstack.org>2016-12-05 14:14:48 +0000
commite46349a37c1e697aa1305349df8269586b5d517d (patch)
tree85cc450b99b6dce9857025034f07a421678e41f2
parenta45fbe02f4ac27a2191c375de06d0a79778cc40a (diff)
parent32f84e5e6e6129c73c1bf40a1935e10e2fe5e1e2 (diff)
Merge "Use transient hostname for deployed servers"
-rw-r--r--deployed-server/deployed-server.yaml19
1 files changed, 2 insertions, 17 deletions
diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml
index da5698e5..22797c2e 100644
--- a/deployed-server/deployed-server.yaml
+++ b/deployed-server/deployed-server.yaml
@@ -69,21 +69,10 @@ resources:
#!/bin/bash
set -eux
mkdir -p $heat_outputs_path
- host=$(hostnamectl --static)
- echo -n "$host " > $heat_outputs_path.hosts_entry
- host_ip=$(python -c "import socket; print socket.gethostbyname(\"$host\")")
- echo -n "$host_ip " >> $heat_outputs_path.hosts_entry
- echo >> $heat_outputs_path.hosts_entry
- cat $heat_outputs_path.hosts_entry
- echo -n $host_ip > $heat_outputs_path.ip_address
- cat $heat_outputs_path.ip_address
+ host=$(hostnamectl --transient)
echo -n $host > $heat_outputs_path.hostname
cat $heat_outputs_path.hostname
outputs:
- - name: hosts_entry
- description: hosts_entry
- - name: ip_address
- description: ip_address
- name: hostname
description: hostname
@@ -108,8 +97,4 @@ outputs:
ctlplane:
- {get_attr: [ControlPlanePort, ip_address]}
name:
- value: {get_attr: [HostsEntryDeployment, hostname]}
- hosts_entry:
- value: {get_attr: [HostsEntryDeployment, hosts_entry]}
- ip_address:
- value: {get_attr: [HostsEntryDeployment, ip_address]}
+ value: {get_attr: [HostsEntryDeployment, hostname]}