openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix ConfigDebug for puppet host runs"

This commit is contained in:
Zuul 2017-10-16 14:40:34 +00:00 committed by Gerrit Code Review
parent b1786cc1b0 ecc6ce340a
commit ba4a74665f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/deploy-steps-tasks.yaml
View File

@ -4,12 +4,16 @@
##################################################### #####################################################
# Per step puppet configuration of the baremetal host # 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 - 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 copy: content="{{dict(step=step|int)|to_json}}" dest=/etc/puppet/hieradata/config_step.json force=true mode=0600
become: true become: true
- name: Run puppet host configuration for step {{step}} - name: Run puppet host configuration for step {{step}}
command: >- command: >-
puppet apply puppet apply {{ host_puppet_config_debug|default('') }}
--modulepath=/etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules --modulepath=/etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
--logdest syslog --logdest console --color=false --logdest syslog --logdest console --color=false
/var/lib/tripleo-config/puppet_step_config.pp /var/lib/tripleo-config/puppet_step_config.pp

6
common/deploy-steps.j2
View File

@ -48,6 +48,10 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json type: json
ConfigDebug:
default: false
description: Whether to run config management (e.g. Puppet) in debug mode.
type: boolean
DockerPuppetDebug: DockerPuppetDebug:
type: string type: string
default: '' default: ''
@ -85,6 +89,7 @@ resources:
- name: role_name - name: role_name
- name: update_identifier - name: update_identifier
- name: bootstrap_server_id - name: bootstrap_server_id
- name: enable_debug
- name: docker_puppet_debug - name: docker_puppet_debug
- name: docker_puppet_process_count - name: docker_puppet_process_count
config: config:
@ -291,6 +296,7 @@ resources:
role_name: {{role.name}} role_name: {{role.name}}
update_identifier: {get_param: DeployIdentifier} update_identifier: {get_param: DeployIdentifier}
bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']} bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']}
enable_debug: {get_param: ConfigDebug}
docker_puppet_debug: {get_param: DockerPuppetDebug} docker_puppet_debug: {get_param: DockerPuppetDebug}
docker_puppet_process_count: {get_param: DockerPuppetProcessCount} docker_puppet_process_count: {get_param: DockerPuppetProcessCount}
{% endfor %} {% endfor %}