Merge "Remove deploy_steps_tasks.yaml from upgrade_steps_playbook" into stable/pike

[apex-tripleo-heat-templates.git] / common / deploy-steps-tasks.yaml

diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index c6935e7..73d3036 100644 (file)
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -5,7 +5,7 @@
     # Per step puppet configuration of the baremetal host
     #####################################################
     - name: Write the config_step hieradata
-      copy: content="{{dict(step=step|int)|to_json}}" dest=/etc/puppet/hieradata/config_step.json force=true
+      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
@@ -27,7 +27,8 @@
       shell: python /var/lib/docker-puppet/docker-puppet.py
       environment:
         NET_HOST: 'true'
-        DEBUG: '{{docker_puppet_debug}}'
+        DEBUG: '{{docker_puppet_debug|default(false)}}'
+        PROCESS_COUNT: '{{docker_puppet_process_count|default(3)}}'
       when: step == "1"
       changed_when: false
       check_mode: no