summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2014-08-04 21:30:06 +0200
committerGiulio Fidente <gfidente@redhat.com>2014-08-06 13:30:58 +0200
commit002051953cabd0784931de5346da53e954af98ab (patch)
tree0cd7292c482c537e26c9b0525fa2df4150ac9ddb
parent02772ba2877b9f6d427c6fd760bf19d6334c68a8 (diff)
Rename NovaCompute resources suffix to be consistent with controller
This change renames a few NovaCompute resources so that the naming is consistent with the controller resources naming choice. Change-Id: I8c22867b208c5e16fd52bb3157f838f762b71470
-rw-r--r--nova-compute-instance.yaml8
-rw-r--r--overcloud-source.yaml10
2 files changed, 9 insertions, 9 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 597b42b2..de5787a2 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -181,8 +181,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
@@ -225,14 +225,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 d6f7eb34..bf3f85ec 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -312,10 +312,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]}
@@ -335,10 +335,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:
@@ -610,7 +610,7 @@ resources:
networks:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
- controller0AllNodes:
+ controller0AllNodesDeployment:
depends_on: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0Passthrough]
type: OS::Heat::StructuredDeployment
properties: