From 94822943c15aaec1c68c5e36dc667185c36f490d Mon Sep 17 00:00:00 2001
From: Jiri Stransky <jistr@redhat.com>
Date: Thu, 16 Jul 2015 10:43:18 +0200
Subject: Allow enabling debug mode for config management (Puppet)

Also adds an environment file which can be passed to heat stack-create
to enable debugging.

Change-Id: I9758e2ca3de6a0bed6d20c37ea19e48f47220721
Depends-On: Ie92d1714a8d7e59d347474039be999bd3a2b542f
---
 puppet/ceph-storage-post.yaml           | 6 ++++++
 puppet/cinder-storage-post.yaml         | 6 ++++++
 puppet/compute-post.yaml                | 6 ++++++
 puppet/controller-config-pacemaker.yaml | 7 +++++++
 puppet/controller-config.yaml           | 7 +++++++
 puppet/controller-post.yaml             | 5 +++++
 puppet/swift-storage-post.yaml          | 8 ++++++++
 7 files changed, 45 insertions(+)

(limited to 'puppet')

diff --git a/puppet/ceph-storage-post.yaml b/puppet/ceph-storage-post.yaml
index 1b5b944d..0f7dd36f 100644
--- a/puppet/ceph-storage-post.yaml
+++ b/puppet/ceph-storage-post.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack ceph storage node post deployment for Puppet
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
   NodeConfigIdentifiers:
@@ -16,6 +20,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index 24d2b8a3..c97cfcf9 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -2,6 +2,10 @@ heat_template_version: 2015-04-30
 description: 'OpenStack cinder storage post deployment for Puppet'
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
   NodeConfigIdentifiers:
@@ -14,6 +18,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
diff --git a/puppet/compute-post.yaml b/puppet/compute-post.yaml
index b4a6126b..b63b06b4 100644
--- a/puppet/compute-post.yaml
+++ b/puppet/compute-post.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack compute node post deployment for Puppet.
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
   NodeConfigIdentifiers:
@@ -17,6 +21,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml
index 38161cd7..dc81498a 100644
--- a/puppet/controller-config-pacemaker.yaml
+++ b/puppet/controller-config-pacemaker.yaml
@@ -3,6 +3,12 @@ heat_template_version: 2015-04-30
 description: >
   A software config which runs manifests/overcloud_controller_pacemaker.pp
 
+parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
+
 resources:
 
   ControllerPuppetConfigImpl:
@@ -10,6 +16,7 @@ resources:
     properties:
       group: puppet
       options:
+        enable_debug: {get_param: ConfigDebug}
         enable_hiera: True
         enable_facter: False
       outputs:
diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
index 4135ffac..f85e1a9e 100644
--- a/puppet/controller-config.yaml
+++ b/puppet/controller-config.yaml
@@ -3,6 +3,12 @@ heat_template_version: 2015-04-30
 description: >
   A software config which runs manifests/overcloud_controller.pp
 
+parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
+
 resources:
 
   ControllerPuppetConfigImpl:
@@ -10,6 +16,7 @@ resources:
     properties:
       group: puppet
       options:
+        enable_debug: {get_param: ConfigDebug}
         enable_hiera: True
         enable_facter: False
       outputs:
diff --git a/puppet/controller-post.yaml b/puppet/controller-post.yaml
index 49cbe1e2..941e1ac5 100644
--- a/puppet/controller-post.yaml
+++ b/puppet/controller-post.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack controller node post deployment for Puppet.
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
   NodeConfigIdentifiers:
@@ -46,6 +50,7 @@ resources:
     properties:
       group: puppet
       options:
+        enable_debug: {get_param: ConfigDebug}
         enable_hiera: True
         enable_facter: False
       inputs:
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index ee50c86a..d22f5386 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -2,6 +2,10 @@ heat_template_version: 2015-04-30
 description: 'OpenStack swift storage node post deployment for Puppet'
 
 parameters:
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   servers:
     type: json
   NodeConfigIdentifiers:
@@ -15,6 +19,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
@@ -32,6 +38,8 @@ resources:
     type: OS::Heat::SoftwareConfig
     properties:
       group: puppet
+      options:
+        enable_debug: {get_param: ConfigDebug}
       outputs:
       - name: result
       config:
-- 
cgit 1.2.3-korg