summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova-compute-instance.yaml7
-rw-r--r--overcloud-source.yaml9
-rw-r--r--undercloud-source.yaml7
3 files changed, 23 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index 318a545c..f8b5ebee 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -172,6 +172,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
@@ -235,6 +241,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 09d2f51f..6b172e77 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]}
@@ -692,6 +700,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: