X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=undercloud-source.yaml;h=9c49e65670e2645b86f7d59c26bdb09184f81881;hb=7337f851bac1a808bc134f4db459b620063fbc0c;hp=3ac148c98bbd21ca0fac0833541a8045a4e3071c;hpb=f9ef45798719254ce66b6374c5f803b04ec86721;p=apex-tripleo-heat-templates.git diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 3ac148c9..9c49e656 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -15,6 +15,17 @@ Parameters: Default: i386 Description: The architecture to use in Nova-BM - i386 or amd64. Type: String + ControllerAddress: + Default: + Fn::Select: + - 0 + - Fn::Select: + - "ctlplane" + - Fn::GetAtt: + - undercloud + - networks + Description: The IP address for controller endpoints in config files. + Type: String Flavor: Default: baremetal Description: Flavor to request when deploying. @@ -85,13 +96,7 @@ Resources: admin-token: Ref: AdminToken controller-address: - Fn::Select: - - 0 - - Fn::Select: - - "ctlplane" - - Fn::GetAtt: - - undercloud - - networks + Ref: ControllerAddress cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: '5000' @@ -115,19 +120,19 @@ Resources: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} + - {Ref: ControllerAddress} - ":8003" metadata_server_url: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} + - {Ref: ControllerAddress} - ":8000" waitcondition_server_url: Fn::Join: - '' - - http:// - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ undercloud, networks ]} ]}]} + - {Ref: ControllerAddress} - ":8000/v1/waitcondition" os-collect-config: cfn: