diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml index feb378b758..c7b833699e 100644 --- a/common/deploy-steps-tasks.yaml +++ b/common/deploy-steps-tasks.yaml @@ -16,6 +16,7 @@ puppet apply {{ host_puppet_config_debug|default('') }} --modulepath=/etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules --detailed-exitcodes + --summarize --logdest syslog --logdest console --color=false /var/lib/tripleo-config/puppet_step_config.pp changed_when: outputs.rc == 2 diff --git a/docker/docker-puppet.py b/docker/docker-puppet.py index 4e4a790c58..916e387dbf 100755 --- a/docker/docker-puppet.py +++ b/docker/docker-puppet.py @@ -225,7 +225,7 @@ def mp_puppet_config((config_volume, puppet_tags, manifest, config_image, volume sync set +e - FACTER_hostname=$HOSTNAME FACTER_uuid=docker /usr/bin/puppet apply \ + FACTER_hostname=$HOSTNAME FACTER_uuid=docker /usr/bin/puppet apply --summarize \ --detailed-exitcodes --color=false --logdest syslog --logdest console --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules $TAGS /etc/config.pp rc=$? set -e diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml index ecccb45118..611b0beccf 100644 --- a/docker/services/haproxy.yaml +++ b/docker/services/haproxy.yaml @@ -194,7 +194,7 @@ outputs: list_join: - '; ' - - "cp -a /tmp/puppet-etc/* /etc/puppet; echo '{\"step\": 1}' > /etc/puppet/hieradata/docker.json" - - "FACTER_uuid=docker puppet apply DEBUG --color=false --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules --tags TAGS -v -e 'CONFIG'" + - "FACTER_uuid=docker puppet apply DEBUG --color=false --summarize --modulepath=/etc/puppet/modules:/usr/share/openstack-puppet/modules --tags TAGS -v -e 'CONFIG'" params: TAGS: 'tripleo::firewall::rule' CONFIG: diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml index 7ded5a337b..39f1752176 100644 --- a/extraconfig/pre_network/host_config_and_reboot.yaml +++ b/extraconfig/pre_network/host_config_and_reboot.yaml @@ -271,7 +271,7 @@ resources: systemctl restart openvswitch # DO NOT use --detailed-exitcodes - puppet apply --logdest console \ + puppet apply --logdest console --summarize \ --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \ -e ' class {"vswitch::dpdk": diff --git a/extraconfig/tasks/run_puppet.sh b/extraconfig/tasks/run_puppet.sh index e3f6c493f5..cbcaab019b 100755 --- a/extraconfig/tasks/run_puppet.sh +++ b/extraconfig/tasks/run_puppet.sh @@ -12,6 +12,7 @@ function run_puppet { set +e puppet apply --detailed-exitcodes \ --modulepath \ + --summarize \ /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules \ "${manifest}" rc=$? diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index da26d00817..410d62ea64 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -235,7 +235,7 @@ outputs: - name: Run puppet apply to set tranport_url in nova.conf tags: step5 when: is_bootstrap_node - command: puppet apply --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules --detailed-exitcodes /root/nova-api_upgrade_manifest.pp + command: puppet apply --summarize --modulepath /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules --detailed-exitcodes /root/nova-api_upgrade_manifest.pp register: puppet_apply_nova_api_upgrade failed_when: puppet_apply_nova_api_upgrade.rc not in [0,2] changed_when: puppet_apply_nova_api_upgrade.rc == 2