diff options
| author |   Clint Byrum <clint@fewbar.com> | 2013-09-16 17:29:24 -0700 |
|---|---|---|
| committer | Clint Byrum <clint@fewbar.com> | 2013-09-17 11:05:59 -0700 |
| commit | 287e97de9cc3dce498403c9cae69ae48108def9c (patch) | |
| tree | c8230bab9c71c15acdbfeebca3ea7ad2b8741ea6 /undercloud-vm.yaml | |
| parent | a0cc5554a4cf01ca09565a0641f10799aa873897 (diff) | |
Replace broken usage of first_private_address
The OpenStack native OS::Nova::Server gives us the full list of
networks rather than AWS::EC2::Instance's contrived view of 'private'
and 'public'. We know we want ctlplane, and use Fn::Select to choose
that network directly. The outer Fn::Select is meant to choose the
first network every time, which may not always be correct, but is at
this point.
Change-Id: Iae54ab8d9ac8d84f4f6e2f86ac1b66aacb687473
Diffstat (limited to 'undercloud-vm.yaml')
| -rw-r--r-- | undercloud-vm.yaml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/undercloud-vm.yaml b/undercloud-vm.yaml index 7bcc8f29..8fda08fb 100644 --- a/undercloud-vm.yaml +++ b/undercloud-vm.yaml @@ -73,9 +73,13 @@ Resources: admin-token: Ref: AdminToken controller-address: - Fn::GetAtt: - - notcompute - - first_private_address + Fn::Select: + - 0 + - Fn::Select: + - "ctlplane" + - Fn::GetAtt: + - notcompute + - networks cinder: db: mysql://cinder:unset@localhost/cinder volume_size_mb: '5000' @@ -96,19 +100,19 @@ Resources: Fn::Join: - '' - - http:// - - {"Fn::GetAtt": [ notcompute, first_private_address ]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} - ":8003" metadata_server_url: Fn::Join: - '' - - http:// - - {"Fn::GetAtt": [ notcompute, first_private_address ]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} - ":8000" waitcondition_server_url: Fn::Join: - '' - - http:// - - {"Fn::GetAtt": [ notcompute, first_private_address ]} + - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [ notcompute, networks ]} ]}]} - ":8000/v1/waitcondition" os-collect-config: cfn: |