aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorRobert Collins <rbtcollins@hp.com>2014-02-20 18:26:22 +1300
committerRobert Collins <rbtcollins@hp.com>2014-02-21 11:13:11 +1300
commit93eaca0e24c58c86882a91eec40aec0cdb417a01 (patch)
tree3beba5ef0845860973664869703b893c75efe454 /overcloud-source.yaml
parent70494ab2cb75e7f7ca83a169eac823b22eb6e180 (diff)
Gather all hypervisor names into /etc/hosts.
Nova compute uses hostnames to do live migration, so we need this, or DNS, and for now this is simpler, as we don't have Designate available in the undercloud. Change-Id: Idf0b106c5fbe60680b23a730eb37619a3d796869
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml48
1 files changed, 39 insertions, 9 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index f51afc4b..0fc850ea 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -194,15 +194,45 @@ Resources:
Ref: NeutronBridgeMappings
StaticHosts:
Fn::Join:
- - ' '
- - - Fn::Select:
- - 0
- - Fn::Select:
- - ctlplane
- - Fn::GetAtt:
- - notCompute0
- - networks
- - {Ref: CloudName}
+ - "\n"
+ - - Fn::Join:
+ - "\n"
+ - Merge::Map:
+ NovaCompute0:
+ Fn::Join:
+ - ' '
+ - - Fn::Select:
+ - 0
+ - Fn::Select:
+ - ctlplane
+ - Fn::GetAtt:
+ - NovaCompute0
+ - networks
+ - Fn::Select:
+ - name
+ - Fn::GetAtt:
+ - NovaCompute0
+ - show
+ - Fn::Join:
+ - '.'
+ - - Fn::Select:
+ - name
+ - Fn::GetAtt:
+ - NovaCompute0
+ - show
+ - 'local'
+ - Fn::Join:
+ - ' '
+ - - Fn::Select:
+ - 0
+ - Fn::Select:
+ - ctlplane
+ - Fn::GetAtt:
+ - notCompute0
+ - networks
+ - {Ref: CloudName}
+ # If CloudName is unset, make the hosts line still valid
+ - unused
NovaCompute0:
Type: FileInclude
Path: nova-compute-instance.yaml