diff options
| author |   Robert Collins <rbtcollins@hp.com> | 2014-02-12 07:59:58 +1300 |
|---|---|---|
| committer | Robert Collins <rbtcollins@hp.com> | 2014-02-12 08:02:59 +1300 |
| commit | 7337f851bac1a808bc134f4db459b620063fbc0c (patch) | |
| tree | 3473d87f4f379d8f019aa00f3d0429fa54465fdc | |
| parent | 6057a369b881e29089321430579588b2aac5005e (diff) | |
Permit overriding the undercloud controller ip.
Currently we infer the controller IP address from Neutron, but when
we get HA, the controller address may move around so would need to
be the floating IP. Equally, folk doing unusual sets may need to
have the IP address be something other than what the seed Neutron
handed out.
Change-Id: I97441d009b831fd7356a6c58f4c9edc7532f7d05
| -rw-r--r-- | undercloud-source.yaml | 25 |
1 files changed, 15 insertions, 10 deletions
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: |