aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-10-17 14:04:05 +0000
committerGerrit Code Review <review@openstack.org>2017-10-17 14:04:05 +0000
commit9d04f0bf0ffcea31e4e51810fde95e276fe24fc2 (patch)
treec846115bb63400668f0dc80328aff1ed6631677a
parentdfec9ce2f460260af0e79c6e602dd801884c609d (diff)
parenta6d6878c891380112c7ddd66e494e30a445b1353 (diff)
Merge "Fix ConfigDebug for puppet host runs" into stable/pike
-rw-r--r--common/deploy-steps-tasks.yaml6
-rw-r--r--common/deploy-steps.j26
2 files changed, 11 insertions, 1 deletions
diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 73d3036..785095b 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -4,11 +4,15 @@
#####################################################
# Per step puppet configuration of the baremetal host
#####################################################
+ - name: Set host puppet debugging fact string
+ set_fact:
+ host_puppet_config_debug: "--debug --verbose"
+ when: enable_debug|default(false)
- name: Write the config_step hieradata
copy: content="{{dict(step=step|int)|to_json}}" dest=/etc/puppet/hieradata/config_step.json force=true mode=0600
- name: Run puppet host configuration for step {{step}}
command: >-
- puppet apply
+ puppet apply {{ host_puppet_config_debug|default('') }}
--modulepath=/etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
--logdest syslog --logdest console --color=false
/var/lib/tripleo-config/puppet_step_config.pp
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index a1bd882..5c923a9 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -48,6 +48,10 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ ConfigDebug:
+ default: false
+ description: Whether to run config management (e.g. Puppet) in debug mode.
+ type: boolean
DockerPuppetDebug:
type: string
default: ''
@@ -85,6 +89,7 @@ resources:
- name: role_name
- name: update_identifier
- name: bootstrap_server_id
+ - name: enable_debug
- name: docker_puppet_debug
- name: docker_puppet_process_count
config:
@@ -291,6 +296,7 @@ resources:
role_name: {{role.name}}
update_identifier: {get_param: DeployIdentifier}
bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']}
+ enable_debug: {get_param: ConfigDebug}
docker_puppet_debug: {get_param: DockerPuppetDebug}
docker_puppet_process_count: {get_param: DockerPuppetProcessCount}
{% endfor %}