diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-04-22 19:20:08 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-04-22 19:20:08 +0000 |
commit | 439825b1b079d7bbf7f65f9c85f3adbed9ec204a (patch) | |
tree | 15da322a241364551b56118c39f5e10912474116 /nova-compute-instance.yaml | |
parent | 5f74f5a5f84577446224c9f2c90c3a045e6a272d (diff) | |
parent | b84513c8d16cd19b57993575c6f54c9eda6f473f (diff) |
Merge "Add passthrough configuration glue."
Diffstat (limited to 'nova-compute-instance.yaml')
-rw-r--r-- | nova-compute-instance.yaml | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 99c2e11c..71e47ccc 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -6,6 +6,43 @@ Parameters: Description: The password for the keystone admin account, used for monitoring, querying neutron etc. Type: String NoEcho: true + ExtraConfig: + Description: | + Additional configuration to inject into the cluster. The JSON should have + the following structure: + {"FILEKEY": + {"config": + [{"section": "SECTIONNAME", + "values": + [{"option": "OPTIONNAME", + "value": "VALUENAME" + } + ] + } + ] + } + } + For instance: + {"nova": + {"config": + [{"section": "default", + "values": + [{"option": "compute_manager", + "value": "ironic.nova.compute.manager.ClusterComputeManager" + } + ] + }, + {"section": "cells", + "values": + [{"option": "driver", + "value": "nova.cells.rpc_driver.CellsRPCDriver" + } + ] + } + ] + } + } + Type: Json KeyName: Description: Name of an existing EC2 KeyPair to enable SSH access to the instances Type: String @@ -163,3 +200,11 @@ Resources: live_update_tenant_name: {Ref: LiveUpdateTenantName} nova_image: {Ref: NovaImage} live_update_image_id: {Ref: LiveUpdateComputeImage} + NovaCompute0Passthrough: + Type: OS::Heat::StructuredDeployment + Properties: + config: {Ref: NovaComputePassthrough} + server: {Ref: NovaCompute0} + signal_transport: NO_SIGNAL + input_values: + passthrough_config: {Ref: ExtraConfig} |