Fix non working repo upgrade command for ffu.
As seen in the related bug, assigning dependent variable in the _vars_ section of Ansible isn't reliable as it's an hash. Use the same refactor here to simplify the cmd_args assignement. Change-Id: I53829f8c4461a648553328a92d7b379d8904da95 Related-Bug: #1749911
This commit is contained in:
parent
8f5eae25f3
commit
688679d602
|
@ -157,12 +157,9 @@ ffu_undercloud_releases: ['ocata', 'pike', 'queens']
|
|||
ffu_undercloud_repo_type: tripleo-repos
|
||||
ffu_undercloud_repo_args:
|
||||
tripleo_repos:
|
||||
- release: ocata
|
||||
args: -b ocata current
|
||||
- release: pike
|
||||
args: -b pike current
|
||||
- release: queens
|
||||
args: -b queens current
|
||||
ocata: "-b ocata current"
|
||||
pike: "-b pike current"
|
||||
queens: "-b queens current"
|
||||
|
||||
# Tripleo OOOQ variables.
|
||||
composable_scenario: ""
|
||||
|
|
|
@ -4,8 +4,7 @@
|
|||
dest: "{{ working_dir }}/undercloud_upgrade_{{ release }}.sh"
|
||||
mode: 0775
|
||||
vars:
|
||||
query: "tripleo_repos[?release=='{{release}}'].args"
|
||||
cmd_args: "{{ ffu_undercloud_repo_args | json_query(query) }}"
|
||||
cmd_args: "{{ ffu_undercloud_repo_args['tripleo_repos'][release]|default('') }}"
|
||||
|
||||
- name: create {{ release }} pre undercloud upgrade workaround script
|
||||
template:
|
||||
|
|
|
@ -7,7 +7,7 @@ set -euo pipefail
|
|||
TRIPLEO_REPOS_RPM=$(curl -L --silent https://trunk.rdoproject.org/centos7/current/ | grep python2-tripleo-repos | awk -F "href" {'print $2'} | awk -F '"' {'print $2'})
|
||||
sudo yum localinstall -y https://trunk.rdoproject.org/centos7/current/${TRIPLEO_REPOS_RPM}
|
||||
|
||||
sudo tripleo-repos {{ cmd_args | join(' ') }} ceph
|
||||
sudo tripleo-repos {{ cmd_args }} ceph
|
||||
{% endif %}
|
||||
|
||||
{% if release == 'ocata' or release == '11' %}
|
||||
|
|
Loading…
Reference in New Issue