summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-07 19:49:46 +0000
committerGerrit Code Review <review@openstack.org>2016-10-07 19:49:46 +0000
commit0fb8e3bddb2f91b347b732026ab34a6b088357ad (patch)
treed304a5359ade1e405ec0f4cb56ddb2c1a0220f6b
parent521b8d418f4b1dd7a4fa65f92737caa03e60f6be (diff)
parenta6d6acd645944e3047b617403fc84e08d60692a1 (diff)
Merge "Add cloud names to hosts output"
-rw-r--r--overcloud.j2.yaml31
1 files changed, 30 insertions, 1 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 6d655c7a..db1a78bf 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -596,7 +596,36 @@ outputs:
The content that should be appended to your /etc/hosts if you want to get
hostname-based access to the deployed nodes (useful for testing without
setting up a DNS).
- value: {get_attr: [allNodesConfig, hosts_entries]}
+ value:
+ list_join:
+ - "\n"
+ - - {get_attr: [allNodesConfig, hosts_entries]}
+ -
+ - str_replace:
+ template: IP HOST
+ params:
+ IP: {get_attr: [VipMap, net_ip_map, external]}
+ HOST: {get_param: CloudName}
+ - str_replace:
+ template: IP HOST
+ params:
+ IP: {get_attr: [VipMap, net_ip_map, ctlplane]}
+ HOST: {get_param: CloudNameCtlplane}
+ - str_replace:
+ template: IP HOST
+ params:
+ IP: {get_attr: [VipMap, net_ip_map, internal_api]}
+ HOST: {get_param: CloudNameInternal}
+ - str_replace:
+ template: IP HOST
+ params:
+ IP: {get_attr: [VipMap, net_ip_map, storage]}
+ HOST: {get_param: CloudNameStorage}
+ - str_replace:
+ template: IP HOST
+ params:
+ IP: {get_attr: [VipMap, net_ip_map, storage_mgmt]}
+ HOST: {get_param: CloudNameStorageManagement}
EnabledServices:
description: The services enabled on each role
value: