Revert "[ci-ffu]Add an option to support puddle configuration in undercloud ffu"
This broke FFWD tests, if we will merge next iteration we will
need proof of job running with this.
This reverts commit 55a5830f09
.
Change-Id: I273aaca107d33a4ce952b73a58b43ba093444ff3
This commit is contained in:
parent
55a5830f09
commit
f56d7e3477
|
@ -164,7 +164,6 @@ upgrade_init_command: false
|
|||
|
||||
# ffu undercloud upgrade
|
||||
ffu_undercloud_releases: ['ocata', 'pike', 'queens']
|
||||
ffu_puddle_releases: ['latest', 'latest', 'latest']
|
||||
ffu_undercloud_repo_type: tripleo-repos
|
||||
ffu_undercloud_repo_args:
|
||||
tripleo_repos:
|
||||
|
|
|
@ -181,11 +181,6 @@ subparsers:
|
|||
help: |
|
||||
Undercloud FFU upgrade releases
|
||||
default: 11,12,13
|
||||
ffu-puddle-releases:
|
||||
type: ListValue
|
||||
help: |
|
||||
FFU upgrade release puddles
|
||||
default: latest,latest,latest
|
||||
undercloud-ffu-repo:
|
||||
type: Value
|
||||
help: |
|
||||
|
|
|
@ -24,9 +24,7 @@
|
|||
include_tasks: undercloud-upgrade.yml
|
||||
loop_control:
|
||||
loop_var: current_release
|
||||
loop:
|
||||
- "{{ ffu_undercloud_releases }}"
|
||||
- "{{ ffu_puddle_releases }}"
|
||||
loop: "{{ ffu_undercloud_releases }}"
|
||||
|
||||
- name: apply post ffu undercloud upgrade workarounds
|
||||
command: "{{ working_dir }}/post_ffu_undercloud_upgrade_workarounds.sh"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
- name: Run pre undercloud upgrade {{ current_release.0 }} workarounds
|
||||
command: "{{ working_dir }}/pre_undercloud_upgrade_{{ current_release.0 }}_workarounds.sh"
|
||||
- name: Run pre undercloud {{ current_release }} upgrade workarounds
|
||||
command: "{{ working_dir }}/pre_undercloud_upgrade_{{ current_release }}_workarounds.sh"
|
||||
when: ffu_upgrade_workarounds
|
||||
|
||||
- name: Include rhos-release role.
|
||||
|
@ -8,19 +8,19 @@
|
|||
name: rhos-release
|
||||
vars:
|
||||
director_build: "{{ install.get('director', {}).build|default(omit) }}"
|
||||
build: "{{ current_release.1 | default(omit) }}"
|
||||
build: "{{ install.build | default(omit) }}"
|
||||
mirror: "{{ install.mirror | default(omit) }}"
|
||||
rr_distro_version: "{{ install.osrelease|default(omit) }}"
|
||||
rhos_release_rpm: "https://url.corp.redhat.com/rhos-release-latest-rpm"
|
||||
release: "{{ current_release.0 }}"
|
||||
release: "{{ current_release }}"
|
||||
rr_buildmods: "pin"
|
||||
become: true
|
||||
become_user: root
|
||||
when: ffu_undercloud_repo_type == 'rhos-release'
|
||||
|
||||
- name: Upgrade undercloud to {{ current_release.0 }}
|
||||
command: "{{ working_dir }}/undercloud_upgrade_{{ current_release.0 }}.sh"
|
||||
- name: Upgrade undercloud to {{ current_release }}
|
||||
command: "{{ working_dir }}/undercloud_upgrade_{{ current_release }}.sh"
|
||||
|
||||
- name: Run post undercloud {{ current_release.0 }} upgrade workarounds
|
||||
command: "{{ working_dir }}/post_undercloud_upgrade_{{ current_release.0 }}_workarounds.sh"
|
||||
- name: Run post undercloud {{ current_release }} upgrade workarounds
|
||||
command: "{{ working_dir }}/post_undercloud_upgrade_{{ current_release }}_workarounds.sh"
|
||||
when: ffu_upgrade_workarounds
|
||||
|
|
Loading…
Reference in New Issue