diff options
| author |   Gregory Haynes <greg@greghaynes.net> | 2014-06-02 10:15:20 -0700 |
|---|---|---|
| committer | Gregory Haynes <greg@greghaynes.net> | 2014-06-02 11:09:00 -0700 |
| commit | 42f32ba95147e6041cf26633557984a3a2179c34 (patch) | |
| tree | b454761cdfcfcf88786e0d4ae8e70548e17241fd | |
| parent | 7d89ec86bdeac7536171feb09891efb8171c0455 (diff) | |
Move bootstrap-host out from bootstack
We have had a change of opinion and are moving bootstrap_host properties
out of bootstack in order to prevent mysql / rabbit from depending on
boot-stack.
Change-Id: I85399019c5fc448e98362ef832988abc8d9d459d
| -rw-r--r-- | overcloud-source.yaml | 5 | ||||
| -rw-r--r-- | undercloud-source.yaml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index d730996e..e3a440f9 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -361,6 +361,9 @@ Resources: admin-token: Ref: AdminToken bootstack: + public_interface_ip: + Ref: NeutronPublicInterfaceIP + bootstrap_host: bootstrap_nodeid: Fn::Select: - 0 @@ -373,8 +376,6 @@ Resources: - Fn::GetAtt: - controller0 - show - public_interface_ip: - Ref: NeutronPublicInterfaceIP nodeid: {get_input: bootstack_nodeid} cinder: db: mysql://cinder:unset@localhost/cinder diff --git a/undercloud-source.yaml b/undercloud-source.yaml index dd5d3855..cf9a43b8 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -154,7 +154,7 @@ Resources: Ref: AdminPassword admin-token: Ref: AdminToken - bootstack: + bootstrap_host: bootstrap_nodeid: Fn::Select: - 0 |