diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-08-25 04:18:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-08-25 04:18:47 +0000 |
| commit | aea200427d55b49da3bb4ab3622795f06fe467e5 (patch) | |
| tree | 007bfbededd391c99dd2827d2cce6ff375d279d9 | |
| parent | bf5fcb4f73d2de2dbaecfbca07095c5909000dcb (diff) | |
| parent | bf62abdc07ec9255122ff1a9155cf9fb809cda09 (diff) | |
Merge "Make signal_transport a parameter"
| -rw-r--r-- | nova-compute-instance.yaml | 7 | ||||
| -rw-r--r-- | overcloud-source.yaml | 9 | ||||
| -rw-r--r-- | undercloud-source.yaml | 7 |
3 files changed, 23 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 86115293..00658ff2 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -170,6 +170,12 @@ parameters: type: string description: The image ID for live-updates to the overcloud compute nodes. default: '' + DefaultSignalTransport: + default: CFN_SIGNAL + description: Transport to use for software-config signals. + type: string + constraints: + - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ] resources: NovaCompute0: type: OS::Nova::Server @@ -232,6 +238,7 @@ resources: depends_on: [NovaCompute0Passthrough] type: OS::Heat::StructuredDeployment properties: + signal_transport: {get_param: DefaultSignalTransport} config: {get_param: AllNodesConfig} server: {get_resource: NovaCompute0} NovaCompute0Passthrough: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index bca88cc6..7ea23e21 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -283,6 +283,12 @@ parameters: description: Keystone key for signing tokens. type: string hidden: true + DefaultSignalTransport: + default: CFN_SIGNAL + description: Transport to use for software-config signals. + type: string + constraints: + - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ] resources: ControlVirtualIP: type: OS::Neutron::Port @@ -317,6 +323,8 @@ resources: Path: nova-compute-instance.yaml SubKey: resources.NovaCompute0Deployment parameters: + DefaultSignalTransport: + get_param: DefaultSignalTransport NovaApiHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} KeystoneHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} NeutronHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]} @@ -691,6 +699,7 @@ resources: depends_on: [controller0Deployment,controller0SSLDeployment,controller0Swift,controller0Passthrough] type: OS::Heat::StructuredDeployment properties: + signal_transport: {get_param: DefaultSignalTransport} config: {get_resource: allNodesConfig} server: {get_resource: controller0} controller0Deployment: diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 8b29df1e..a4adea08 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -181,6 +181,12 @@ parameters: description: Keystone key for signing tokens. type: string hidden: true + DefaultSignalTransport: + default: CFN_SIGNAL + description: Transport to use for software-config signals. + type: string + constraints: + - allowed_values: [ CFN_SIGNAL, HEAT_SIGNAL, NO_SIGNAL ] resources: RabbitCookie: type: OS::Heat::RandomString @@ -330,6 +336,7 @@ resources: properties: config: {get_resource: undercloudConfig} server: {get_resource: undercloud} + signal_transport: {get_param: DefaultSignalTransport} input_values: bootstack_nodeid: get_attr: |