diff options
Diffstat (limited to 'undercloud-source.yaml')
| -rw-r--r-- | undercloud-source.yaml | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/undercloud-source.yaml b/undercloud-source.yaml index e39eb5ee..e09b3db5 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -1,5 +1,5 @@ description: All-in-one baremetal OpenStack and all dependencies. -heat_template_version: 2014-10-16 +heat_template_version: 2013-05-23 parameters: AdminPassword: default: unset @@ -216,6 +216,17 @@ resources: get_param: NeutronPublicInterfaceIP controller-address: get_input: controller_host + corosync: + bindnetaddr: {get_input: controller_host} + mcastport: 5577 + nodes: + Merge::Map: + controller0: + ip: {get_attr: [undercloud, networks, ctlplane, 0]} + pacemaker: + stonith_enabled : false + recheck_interval : 5 + quorum_policy : ignore ceilometer: db: mysql://ceilometer:unset@localhost/ceilometer metering_secret: {get_param: CeilometerMeteringSecret} @@ -308,45 +319,44 @@ resources: networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG - 99_undercloudDeployment: + undercloudDeployment: + depends_on: [undercloudPassthroughDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudConfig} server: {get_resource: undercloud} input_values: bootstack_nodeid: - Fn::Select: - - name - - get_attr: - - undercloud - - show + get_attr: + - undercloud + - show + - name controller_host: - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - get_attr: - - undercloud - - networks + get_attr: + - undercloud + - networks + - ctlplane + - 0 heat.watch_server_url: - list_join: + Fn::Join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} + - get_attr: [undercloud, networks, ctlplane, 0] - ':8003' heat.metadata_server_url: - list_join: + Fn::Join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} + - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000' heat.waitcondition_server_url: - list_join: + Fn::Join: - '' - - 'http://' - - {"Fn::Select": [ 0, "Fn::Select": [ ctlplane, { get_attr: [ undercloud, networks ]}]]} + - {get_attr: [undercloud, networks, ctlplane, 0]} - ':8000/v1/waitcondition' - 00_undercloudPassthroughDeployment: + undercloudPassthroughDeployment: + depends_on: [undercloudNovaDeployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: undercloudPassthroughConfig} |