openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unuseful become: true from deploy-steps"

Browse Source
This commit is contained in:
Zuul
2018-07-11 00:03:10 +00:00
committed by Gerrit Code Review
parent d2994ca593 c494a508f8
commit 65795c744a
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,6 @@
- name: Write config data at the start of step 1 - name: Write config data at the start of step 1
when: step == "1" when: step == "1"
become: true
block: block:
- name: Create /var/lib/tripleo-config directory - name: Create /var/lib/tripleo-config directory
file: file:
@@ -151,7 +150,6 @@
dest: /etc/puppet/hieradata/config_step.json dest: /etc/puppet/hieradata/config_step.json
force: true force: true
mode: '0600' mode: '0600'
become: true
- name: Run puppet host configuration for step {{ step }} - name: Run puppet host configuration for step {{ step }}
when: enable_puppet|default(true)|bool when: enable_puppet|default(true)|bool
@@ -167,7 +165,6 @@
register: outputs register: outputs
failed_when: false failed_when: false
no_log: true no_log: true
become: true
- name: "Debug output for task which failed: Run puppet host configuration for step {{ step }}" - name: "Debug output for task which failed: Run puppet host configuration for step {{ step }}"
debug: debug:
@@ -193,7 +190,6 @@
register: outputs register: outputs
failed_when: false failed_when: false
no_log: true no_log: true
become: true
- name: "Debug output for task which failed: Run docker-puppet tasks (generate config) during step {{ step }}" - name: "Debug output for task which failed: Run docker-puppet tasks (generate config) during step {{ step }}"
debug: debug:
@@ -218,7 +214,6 @@
register: outputs register: outputs
failed_when: false failed_when: false
no_log: true no_log: true
become: true
- name: "Debug output for task which failed: Start containers for step {{ step }}" - name: "Debug output for task which failed: Start containers for step {{ step }}"
debug: debug:
@@ -234,7 +229,6 @@
stat: stat:
path: /var/lib/docker-puppet/docker-puppet-tasks{{ step }}.json path: /var/lib/docker-puppet/docker-puppet-tasks{{ step }}.json
register: docker_puppet_tasks_json register: docker_puppet_tasks_json
become: true
- name: Run docker-puppet tasks (bootstrap tasks) for step {{ step }} - name: Run docker-puppet tasks (bootstrap tasks) for step {{ step }}
shell: python /var/lib/docker-puppet/docker-puppet.py shell: python /var/lib/docker-puppet/docker-puppet.py
@@ -251,7 +245,6 @@
register: outputs register: outputs
failed_when: false failed_when: false
no_log: true no_log: true
become: true
- name: "Debug output for task which failed: Run docker-puppet tasks (bootstrap tasks) for step {{ step }}" - name: "Debug output for task which failed: Run docker-puppet tasks (bootstrap tasks) for step {{ step }}"
debug: debug:

2
common/deploy-steps.j2
View File

@@ -463,7 +463,6 @@ outputs:
any_errors_fatal: yes any_errors_fatal: yes
vars: vars:
bootstrap_server_id: BOOTSTRAP_SERVER_ID bootstrap_server_id: BOOTSTRAP_SERVER_ID
become: true
tasks: tasks:
{%- for role in roles %} {%- for role in roles %}
- import_tasks: {{role.name}}/host_prep_tasks.yaml - import_tasks: {{role.name}}/host_prep_tasks.yaml
@@ -667,7 +666,6 @@ outputs:
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
template: | template: |
- hosts: DEPLOY_TARGET_HOST - hosts: DEPLOY_TARGET_HOST
become: true
tasks: tasks:
- set_fact: - set_fact:
releases: {get_param: [FastForwardUpgradeReleases]} releases: {get_param: [FastForwardUpgradeReleases]}