From 93eaca0e24c58c86882a91eec40aec0cdb417a01 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Thu, 20 Feb 2014 18:26:22 +1300 Subject: 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 --- overcloud-source.yaml | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file 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 -- cgit 1.2.3-korg