From 8e0331271dd8d1dd6cb8b6c5b67bee7497b6a673 Mon Sep 17 00:00:00 2001 From: Nicholas Randon Date: Mon, 21 Jul 2014 16:43:38 +0100 Subject: Add specific pass-through config for each role Supplement ExtraConfig with specific versions - ControllerExtraConfig and NovaComputeExtraConfig. This allows the user to specify different configurations for each role. Change-Id: Ieaee80e414130504a5e40e878a5a4ca1c196ca2b --- nova-compute-instance.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'nova-compute-instance.yaml') diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 86115293..1c2224ec 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 @@ -243,3 +250,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} -- cgit 1.2.3-korg