diff options
| -rw-r--r-- | overcloud-source.yaml | 94 |
1 files changed, 80 insertions, 14 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 3aafb6dd..6949deaa 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -277,17 +277,32 @@ Resources: - show - 'novalocal' - Fn::Join: - - ' ' - - - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - Fn::GetAtt: - - controller0 - - networks - - {Ref: CloudName} - # If CloudName is unset, make the hosts line still valid - - unused + - "\n" + - Merge::Map: + controller0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - 'novalocal' + - {Ref: CloudName} NovaCompute0Passthrough: Type: OS::Heat::StructuredDeployment Properties: @@ -456,9 +471,60 @@ Resources: - ':8000/v1/waitcondition' hosts: Fn::Join: - - ' ' - - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { "Fn::GetAtt": [ controller0, 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 + - 'novalocal' + - Fn::Join: + - "\n" + - Merge::Map: + controller0: + Fn::Join: + - ' ' + - - Fn::Select: + - 0 + - Fn::Select: + - ctlplane + - Fn::GetAtt: + - controller0 + - networks + - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - Fn::Join: + - '.' + - - Fn::Select: + - name + - Fn::GetAtt: + - controller0 + - show + - 'novalocal' + - {Ref: CloudName} controller0SSLDeployment: Type: OS::Heat::StructuredDeployment Properties: |