From f6561dae7ee4f4fd074ddc5bc4751c6ca4dec16e Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Wed, 3 Oct 2018 12:24:04 +0200 Subject: [PATCH] Remove usage of target_upgrade_version. With the ongoing refactoring for upgrades jobs we start passing the corresponding release file for each playbook instead of passing the N_uc_N-1_oc.yaml release file. One of the variables defined in the old upgrades release file was target_upgrade_version, in which it's specified the release we are upgrading to. That's not needed anymore, as we can obtain that value from the emit_releases.sh Closes-Bug: #1812403 Change-Id: I5ac14e5fc28300e083fb4b921cbf4ba627904748 --- playbooks/multinode-overcloud-upgrade.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/multinode-overcloud-upgrade.yml b/playbooks/multinode-overcloud-upgrade.yml index e3131c8df..54d95f837 100644 --- a/playbooks/multinode-overcloud-upgrade.yml +++ b/playbooks/multinode-overcloud-upgrade.yml @@ -6,7 +6,7 @@ gather_facts: false vars: repo_run_live: false - repo_setup_script: "repo-setup-{{ target_upgrade_version }}.sh" + repo_setup_script: "repo-setup-{{ release }}.sh" # Avoid running yum update, only set up repos repo_setup_run_update: false artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz" @@ -44,7 +44,7 @@ tags: - overcloud-upgrade vars: - repo_setup_script: "{{ working_dir }}/repo-setup-{{ target_upgrade_version }}.sh" + repo_setup_script: "{{ working_dir }}/repo-setup-{{ release }}.sh" roles: - role: tripleo-upgrade upgrade_init_command: "{{ (repo_setup_script|exists) | ternary(lookup('file', repo_setup_script), false) }}"