diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-07-02 03:30:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-07-02 03:30:52 +0000 |
| commit | 484c0551b2b39fa1932394ca2062ab5a4509194f (patch) | |
| tree | 6ef47c33504de665a533a70dd18a6b83a99896bf /overcloud-source.yaml | |
| parent | 70f812c5e5ef108c4b152fa72bf55c99bb2f0c6d (diff) | |
| parent | 19271ebcd290997b99647da1e1e27ac21633aea4 (diff) | |
Merge "Compute all hosts matrix once"
Diffstat (limited to 'overcloud-source.yaml')
| -rw-r--r-- | overcloud-source.yaml | 77 |
1 files changed, 18 insertions, 59 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml index e2198466..d7d27949 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -307,62 +307,12 @@ Resources: Ref: HypervisorNeutronPublicInterface NeutronBridgeMappings: Ref: NeutronBridgeMappings - StaticHosts: - Fn::Join: - - "\n" - - - Fn::Join: - - "\n" - - Merge::Map: - NovaCompute0: - Fn::Join: - - ' ' - - - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - Fn::GetAtt: - - NovaCompute0 - - networks - - Fn::Select: - - name - - Fn::GetAtt: - - NovaCompute0 - - show - - Fn::Join: - - '.' - - - Fn::Select: - - name - - Fn::GetAtt: - - NovaCompute0 - - show - - 'novalocal' - - Fn::Join: - - "\n" - - Merge::Map: - controller0: - Fn::Join: - - ' ' - - - Fn::Select: - - 0 - - Fn::Select: - - ctlplane - - Fn::GetAtt: - - controller0 - - networks - - Fn::Select: - - name - - Fn::GetAtt: - - controller0 - - show - - Fn::Join: - - '.' - - - Fn::Select: - - name - - Fn::GetAtt: - - controller0 - - show - - 'novalocal' - - {Ref: CloudName} + NovaCompute0Hosts: + Type: FileInclude + Path: nova-compute-instance.yaml + SubKey: Resources.NovaCompute0HostsDeploy + Parameters: + HostsConfig: {Ref: allHostsConfig} NovaCompute0Passthrough: Type: OS::Heat::StructuredDeployment Properties: @@ -444,7 +394,6 @@ Resources: watch_server_url: {get_input: heat.watch_server_url} metadata_server_url: {get_input: heat.metadata_server_url} waitcondition_server_url: {get_input: heat.waitcondition_server_url} - hosts: {get_input: hosts} keystone: db: mysql://keystone:unset@localhost/keystone host: @@ -584,6 +533,12 @@ Resources: key_name: Ref: KeyName user_data_format: SOFTWARE_CONFIG + controller0Hosts: + Type: OS::Heat::StructuredDeployment + Properties: + config: {Ref: allHostsConfig} + server: {Ref: controller0} + signal_transport: NO_SIGNAL controller0Deployment: Type: OS::Heat::StructuredDeployment Properties: @@ -604,6 +559,8 @@ Resources: - Fn::GetAtt: - controller0 - networks + controller_virtual_ip: + {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} heat.watch_server_url: Fn::Join: - '' @@ -622,6 +579,10 @@ Resources: - - 'http://' - {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} - ':8000/v1/waitcondition' + allHostsConfig: + Type: OS::Heat::StructuredConfig + Properties: + config: hosts: Fn::Join: - "\n" @@ -678,8 +639,6 @@ Resources: - show - 'novalocal' - {Ref: CloudName} - controller_virtual_ip: - {'Fn::Select': [ip_address, 'Fn::Select': [0, 'Fn::GetAtt': [ControlVirtualIP, fixed_ips]]]} controller0SSLDeployment: Type: OS::Heat::StructuredDeployment Properties: |