Merge "Refactor Heat dependencies for nova compute"

2014-10-16 15:42:43 +00:00 · 2014-10-16 15:42:43 +00:00 · 83914a012b
commit 83914a012b
parent ad0692e3e8 faf2c2f45a
1 changed files with 4 additions and 3 deletions
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@ -207,7 +207,6 @@ resources:
        - network: ctlplane
      user_data_format: SOFTWARE_CONFIG
  NovaCompute0Deployment:
-    depends_on: [controller0AllNodesDeployment]
    type: OS::Heat::StructuredDeployment
    properties:
      signal_transport: NO_SIGNAL
@ -254,14 +253,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}