summaryrefslogtreecommitdiffstats
path: root/nova-compute-instance.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-18 13:09:34 +0000
committerGerrit Code Review <review@openstack.org>2014-08-18 13:09:34 +0000
commit5dd1df95434b74c6abce5cbaf35ad68848645a24 (patch)
treebd187543eac509fcf7977b0d4f1033122277e56a /nova-compute-instance.yaml
parent91fd462aae986746296d6ca3065514f8a0676b66 (diff)
parent002051953cabd0784931de5346da53e954af98ab (diff)
Merge "Rename NovaCompute resources suffix to be consistent with controller"
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r--nova-compute-instance.yaml8
1 files changed, 4 insertions, 4 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}