diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-18 13:09:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-18 13:09:34 +0000 |
| commit | 5dd1df95434b74c6abce5cbaf35ad68848645a24 (patch) | |
| tree | bd187543eac509fcf7977b0d4f1033122277e56a | |
| parent | 91fd462aae986746296d6ca3065514f8a0676b66 (diff) | |
| parent | 002051953cabd0784931de5346da53e954af98ab (diff) | |
Merge "Rename NovaCompute resources suffix to be consistent with controller"
| -rw-r--r-- | nova-compute-instance.yaml | 8 | ||||
| -rw-r--r-- | overcloud-source.yaml | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index c5f4337c..86115293 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -183,8 +183,8 @@ resources: networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG - NovaCompute0Deploy: - depends_on: [controller0AllNodes] + NovaCompute0Deployment: + depends_on: [controller0AllNodesDeployment] type: OS::Heat::StructuredDeployment properties: signal_transport: NO_SIGNAL @@ -228,14 +228,14 @@ resources: nova_image: {get_param: NovaImage} live_update_image_id: {get_param: LiveUpdateComputeImage} ntp_server: {get_param: NtpServer} - NovaCompute0AllNodesDeploy: + NovaCompute0AllNodesDeployment: depends_on: [NovaCompute0Passthrough] type: OS::Heat::StructuredDeployment properties: config: {get_param: AllNodesConfig} server: {get_resource: NovaCompute0} NovaCompute0Passthrough: - depends_on: [NovaCompute0Deploy] + depends_on: [NovaCompute0Deployment] type: OS::Heat::StructuredDeployment properties: config: {get_resource: NovaComputePassthrough} diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 4929de86..93a68344 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -308,10 +308,10 @@ resources: length: 20 salt: get_param: RabbitCookieSalt - NovaCompute0Deploy: + NovaCompute0Deployment: type: FileInclude Path: nova-compute-instance.yaml - SubKey: resources.NovaCompute0Deploy + SubKey: resources.NovaCompute0Deployment parameters: NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} @@ -347,10 +347,10 @@ resources: get_param: HypervisorNeutronPublicInterface NeutronBridgeMappings: get_param: NeutronBridgeMappings - NovaCompute0AllNodes: + NovaCompute0AllNodesDeployment: type: FileInclude Path: nova-compute-instance.yaml - SubKey: resources.NovaCompute0AllNodesDeploy + SubKey: resources.NovaCompute0AllNodesDeployment parameters: AllNodesConfig: {get_resource: allNodesConfig} NovaCompute0Passthrough: @@ -682,7 +682,7 @@ resources: networks: - network: ctlplane user_data_format: SOFTWARE_CONFIG - controller0AllNodes: + controller0AllNodesDeployment: depends_on: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0Passthrough] type: OS::Heat::StructuredDeployment properties: |