diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-09-10 12:01:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-09-10 12:01:42 +0000 |
commit | 218bd3cad53aef9b9890bc3119a4280c7e54806e (patch) | |
tree | a00a66f012ffd0e002e6ac963be003ea4f0854ab /nova-compute-instance.yaml | |
parent | cdfe285f791ede790e8ba1ab246807a9a2af1b41 (diff) | |
parent | 8e0331271dd8d1dd6cb8b6c5b67bee7497b6a673 (diff) |
Merge "Add specific pass-through config for each role"
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r-- | nova-compute-instance.yaml | 16 |
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} |