summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Cammann <tom.cammann@hp.com>2014-09-18 11:28:08 +0100
committerTom Cammann <tom.cammann@hp.com>2014-10-14 14:29:21 +0000
commitfaf2c2f45ab77c650c399a01694fc8c1d635a347 (patch)
treed01403966baa9fbdb328a4a414d3f8c90d19dd05
parent6e766483306ae0dabd4fff47f9234ede588f7be4 (diff)
Refactor Heat dependencies for nova compute
Allows heat to have more control of the parallelism of the deploy and allow easy integration of the new heat dependencies required for nova compute integration. At present is difficult understand and has unnecessary complex dependencies. Change-Id: Ie566b8b14cbd98fe29cc2368a96d45cc74ca4715 Co-Authored-By: Nicholas Randon <nicholas.randon@hp.com>
-rw-r--r--nova-compute-instance.yaml7
1 files changed, 4 insertions, 3 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 5b54a540..eeb56a04 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -209,7 +209,6 @@ resources:
- network: ctlplane
user_data_format: SOFTWARE_CONFIG
NovaCompute0Deployment:
- depends_on: [controller0AllNodesDeployment]
type: OS::Heat::StructuredDeployment
properties:
signal_transport: NO_SIGNAL
@@ -256,14 +255,16 @@ resources:
live_update_image_id: {get_param: LiveUpdateComputeImage}
ntp_server: {get_param: NtpServer}
NovaCompute0AllNodesDeployment:
- depends_on: [NovaCompute0Passthrough]
+ depends_on:
+ - controller0AllNodesDeployment
+ - NovaCompute0Deployment
+ - NovaCompute0PassthroughSpecific
type: OS::Heat::StructuredDeployment
properties:
signal_transport: {get_param: DefaultSignalTransport}
config: {get_param: AllNodesConfig}
server: {get_resource: NovaCompute0}
NovaCompute0Passthrough:
- depends_on: [NovaCompute0Deployment]
type: OS::Heat::StructuredDeployment
properties:
config: {get_resource: NovaComputePassthrough}