Remove tasks from overcloud upgrade playbook.
Remove the tasks being executed inside the playbook used for running overcloud upgrades. Most of these task are being handled somewhere else (import tripleo-upgrade [0], mainly) so we can simplify the playbook by importing the tripleo-upgrade role with the required parameters defined in each fs. [0] Icc84645a16aa53ca2cb974dbeb52e6474cd98aab Related-Bug: #1749740 Change-Id: Iaf30244187d27909ab803175843056e0827d0b24
This commit is contained in:
Jose Luis Franco Arza
parent
3fbe285959
commit
a65a8418cb
|
|
@ -1,18 +0,0 @@
|
|||
- name: Set up repos on subnodes for upgrading
|
||||
hosts: overcloud
|
||||
vars:
|
||||
ib_repo_host: undercloud
|
||||
roles:
|
||||
- role: repo-setup
|
||||
when: mixed_upgrade|default(false)|bool
|
||||
- role: install-built-repo
|
||||
when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool
|
||||
|
||||
- name: Upgrade Tripleo
|
||||
hosts: undercloud
|
||||
tags:
|
||||
- overcloud-upgrade
|
||||
gather_facts: no
|
||||
roles:
|
||||
- role: overcloud-upgrade
|
||||
when: containerized_overcloud_upgrade|bool
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
- name: Generate repo-setup script for overcloud upgrade
|
||||
hosts: undercloud
|
||||
tags:
|
||||
- overcloud-upgrade
|
||||
gather_facts: no
|
||||
vars:
|
||||
repo_run_live: false
|
||||
repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh"
|
||||
# Avoid running yum update, only set up repos
|
||||
repo_setup_run_update: false
|
||||
roles:
|
||||
- role: repo-setup
|
||||
when: containerized_overcloud_upgrade|bool
|
||||
- role: install-built-repo
|
||||
when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool
|
||||
|
||||
- name: Prepare containers for Upgrade
|
||||
hosts: undercloud
|
||||
gather_facts: no
|
||||
tags:
|
||||
- overcloud-prep-containers
|
||||
roles:
|
||||
- role: overcloud-prep-containers
|
||||
# This need the new repo in place.
|
||||
update_containers: true
|
||||
# This enable us to run it even on non-containerized overcloud deployment
|
||||
# ie, ffu upgrade where deployment is on newton.
|
||||
containerized_overcloud: "{{prep_container_upgrade_run|default(false)}}"
|
||||
# Do not overwrite the deployment log if any.
|
||||
overcloud_prep_containers_log: "upgrade_overcloud_prep_containers.log"
|
||||
overcloud_prep_containers_script: "upgrade_overcloud_prep_containers.sh"
|
||||
when: containerized_overcloud_upgrade|bool
|
||||
|
||||
#FIXME(chem): tech-debt LP#1749740
|
||||
- name: Upgrade TripleO
|
||||
hosts: undercloud
|
||||
gather_facts: yes
|
||||
tags:
|
||||
- overcloud-upgrade
|
||||
vars:
|
||||
repo_setup_script: "{{ working_dir }}/repo-setup-{{ target_upgrade_version }}.sh"
|
||||
tripleo_upgrade_branch: "{{ 'stable/'+target_upgrade_version if target_upgrade_version!='master' else target_upgrade_version }}"
|
||||
tasks:
|
||||
- name: Filter ansible_br_*
|
||||
setup:
|
||||
filter: ansible_br_*
|
||||
|
||||
- name: Check repo setup script exists
|
||||
stat:
|
||||
path: "{{ repo_setup_script }}"
|
||||
register: repo_script_status
|
||||
|
||||
- name: Set fact with repo script content or false
|
||||
set_fact:
|
||||
update_repo_script_content: "{% if repo_script_status.stat.exists %}{{ lookup('file', repo_setup_script) }}{% else %}false{% endif %}"
|
||||
|
||||
- name: Copy current T-H-T directory to the upgrade working dir
|
||||
synchronize:
|
||||
src: /usr/share/openstack-tripleo-heat-templates
|
||||
dest: "{{ overcloud_templates_path }}"
|
||||
when: containerized_overcloud_upgrade|bool
|
||||
|
||||
- name: Check if we have a local copy of the tripleo-upgrade role
|
||||
stat:
|
||||
path: /opt/stack/new/tripleo-upgrade
|
||||
register: tripleo_upgrade_local_role
|
||||
|
||||
- name: Set the pip URL when we have a local copy of the role
|
||||
set_fact:
|
||||
tripleo_upgrade_pip_url: "file:///opt/stack/new/tripleo-upgrade#egg=tripleo-upgrade"
|
||||
when: tripleo_upgrade_local_role.stat.exists
|
||||
|
||||
- name: Set the pip URL when we DO NOT have a local copy of the role
|
||||
set_fact:
|
||||
tripleo_upgrade_pip_url: "git+https://git.openstack.org/openstack/tripleo-upgrade.git@{{ tripleo_upgrade_branch }}#egg=tripleo-upgrade"
|
||||
when: tripleo_upgrade_local_role.stat.exists == False
|
||||
|
||||
- name: Install tripleo-upgrade role "{{ tripleo_upgrade_branch }}" branch
|
||||
pip:
|
||||
name: "{{ tripleo_upgrade_pip_url }}"
|
||||
executable: "{{ local_working_dir }}/bin/pip"
|
||||
|
||||
- name: Run Tripleo-upgrade role
|
||||
vars:
|
||||
upgrade_init_command: "{{ update_repo_script_content }}"
|
||||
include_role:
|
||||
name: tripleo-upgrade
|
||||
when: containerized_overcloud_upgrade|bool
|
||||
|
|
@ -1,12 +1,44 @@
|
|||
# TODO: This is to keep legacy job compatibility.
|
||||
# Currently used by P->Q and O->P job.
|
||||
- name: Overcloud upgrade compatibility mode. Please switch to tripleo-upgrade role.
|
||||
when: not use_tripleo_upgrade|default(false)|bool
|
||||
include: multinode-overcloud-upgrade-legacy.yml
|
||||
- name: Generate repo-setup script for overcloud upgrade
|
||||
hosts: undercloud
|
||||
tags:
|
||||
- overcloud-upgrade
|
||||
gather_facts: no
|
||||
vars:
|
||||
repo_run_live: false
|
||||
repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh"
|
||||
# Avoid running yum update, only set up repos
|
||||
repo_setup_run_update: false
|
||||
roles:
|
||||
- role: repo-setup
|
||||
when: containerized_overcloud_upgrade|default(false)|bool
|
||||
- role: install-built-repo
|
||||
when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool
|
||||
|
||||
# TODO(chem): that glue code part should be in its own role, to keep the
|
||||
# playbook clean.
|
||||
- name: Overcloud tripleo-upgrade.
|
||||
when: use_tripleo_upgrade|default(false)|bool
|
||||
include: multinode-overcloud-upgrade-new.yml
|
||||
- name: Prepare containers for Upgrade
|
||||
hosts: undercloud
|
||||
gather_facts: no
|
||||
tags:
|
||||
- overcloud-prep-containers
|
||||
roles:
|
||||
- role: overcloud-prep-containers
|
||||
# This need the new repo in place.
|
||||
update_containers: true
|
||||
# This enable us to run it even on non-containerized overcloud deployment
|
||||
# ie, ffu upgrade where deployment is on newton.
|
||||
containerized_overcloud: "{{prep_container_upgrade_run|default(false)}}"
|
||||
# Do not overwrite the deployment log if any.
|
||||
overcloud_prep_containers_log: "upgrade_overcloud_prep_containers.log"
|
||||
overcloud_prep_containers_script: "upgrade_overcloud_prep_containers.sh"
|
||||
when: containerized_overcloud_upgrade|default(false)|bool
|
||||
|
||||
- name: Run tripleo-upgrade role to upgrade overcloud
|
||||
hosts: undercloud
|
||||
gather_facts: yes
|
||||
tags:
|
||||
- overcloud-upgrade
|
||||
vars:
|
||||
repo_setup_script: "{{ working_dir }}/repo-setup-{{ target_upgrade_version }}.sh"
|
||||
roles:
|
||||
- role: tripleo-upgrade
|
||||
upgrade_init_command: "{{ (repo_setup_script|exists) | ternary(lookup('file', repo_setup_script), false) }}"
|
||||
when: overcloud_upgrade|default(false)|bool
|
||||
|
|
|
|||
Loading…
Reference in New Issue