From bf62abdc07ec9255122ff1a9155cf9fb809cda09 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Mon, 11 Aug 2014 17:13:22 -0700
Subject: Make signal_transport a parameter

There may be times where an update needs to change this without changing
the template, such as when updates will be done by something other than
Heat (i.e. Ansible).

Change-Id: I89d1153acab697b64468f841b3f2d17c169da649
---
 nova-compute-instance.yaml | 7 +++++++
 overcloud-source.yaml      | 9 +++++++++
 undercloud-source.yaml     | 7 +++++++
 3 files changed, 23 insertions(+)

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 93a68344..8db9f856 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
@@ -313,6 +319,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]}
@@ -686,6 +694,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 e09b3db5..19719dc5 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
@@ -325,6 +331,7 @@ resources:
     properties:
       config: {get_resource: undercloudConfig}
       server: {get_resource: undercloud}
+      signal_transport: {get_param: DefaultSignalTransport}
       input_values:
         bootstack_nodeid:
           get_attr:
-- 
cgit 1.2.3-korg