Merge "Add specific pass-through config for each role"

1 files changed, 16 insertions, 0 deletions

diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index d89155ce..d368f14b 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -7,6 +7,7 @@ parameters:
     type: string
     hidden: true
   ExtraConfig:
+    default: {}
     description: |
       Additional configuration to inject into the cluster. The JSON should have
       the following structure:
@@ -43,6 +44,12 @@ parameters:
           }
         }
     type: json
+  NovaComputeExtraConfig:
+    default: {}
+    description: |
+      NovaCompute specific configuration to inject into the cluster. Same
+      structure as ExtraConfig.
+    type: json
   KeyName:
     description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     type: string
@@ -253,3 +260,12 @@ resources:
       signal_transport: NO_SIGNAL
       input_values:
         passthrough_config: {get_param: ExtraConfig}
+  NovaCompute0PassthroughSpecific:
+    depends_on: [NovaCompute0Passthrough]
+    type: OS::Heat::StructuredDeployment
+    properties:
+      config: {get_resource: NovaComputePassthroughSpecific}
+      server: {get_resource: NovaCompute0}
+      signal_transport: NO_SIGNAL
+      input_values:
+        passthrough_config_specific: {get_param: NovaComputeExtraConfig}