openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove common bootstrap_nodeid from deploy_steps/tripleo-packages.yaml"

Browse Source
This commit is contained in:
Zuul 2018-12-07 16:57:36 +00:00 committed by Gerrit Code Review
commit 570f1da4e3
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/deploy-steps.j2
View File

@ -931,17 +931,6 @@ outputs:
when: tripleo_role_name == '{{role.name}}'
name: Run Fast Forward Upgrade Prep Workarounds for {{role.name}}
{%- endfor %}
{% raw %}
- name: get bootstrap nodeid
tags: common
command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
register: bootstrap_node
- name: set is_bootstrap_node ffu_packages_bootstrap_only facts
tags: common
set_fact:
is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
ffu_packages_apply={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
{% endraw %}
- name: Create /var/lib/docker-puppet
file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
- name: Write docker-puppet.py

10
puppet/services/tripleo-packages.yaml
View File

@ -256,6 +256,8 @@ outputs:
enabled: yes
state: started
fast_forward_upgrade_tasks:
- name: set is_bootstrap_node fact
set_fact: is_bootstrap_node={{tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower}}
- name: Register repo type and args
set_fact:
fast_forward_repo_type: {get_param: FastForwardRepoType}
@ -277,7 +279,7 @@ outputs:
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
when:
- step|int == 3
- ffu_packages_apply|bool
- is_bootstrap_node|bool
- fast_forward_repo_type == 'tripleo-repos'
- block:
- name: Create custom Script for upgrading repo.
@ -289,7 +291,7 @@ outputs:
shell: "/root/ffu_update_repo.sh {{release}}"
when:
- step|int == 3
- ffu_packages_apply|bool
- is_bootstrap_node|bool
- fast_forward_repo_type == 'custom-script'
fast_forward_post_upgrade_tasks:
- name: Register repo type and args
@ -310,7 +312,7 @@ outputs:
- name: Enable tripleo-repos
command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
when:
- ffu_packages_apply|bool
- is_bootstrap_node|bool
- fast_forward_repo_type == 'tripleo-repos'
- block:
@ -322,5 +324,5 @@ outputs:
- name: Execute custom script for upgrading repo.
shell: "/root/ffu_update_repo.sh {{release}}"
when:
- ffu_packages_apply|bool
- is_bootstrap_node|bool
- fast_forward_repo_type == 'custom-script'