openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Wire up pike .. queens upgrade workflow (controller only for now) 

Right now the master upgrade job is running the composable steps
upgrade but that is only for Pike. For master we instead have
cli support for generating the playbooks.

See also https://review.rdoproject.org/r/#/c/11392/ /#/c/11685/

Depends-On: Ica4bb404cd3a38a97300b8af36af41c35f09825c
Change-Id: I9fbf3f454d619eae3e27ab48034e47ab767e9e14
This commit is contained in:
marios 2017-12-06 11:27:04 +02:00 committed by Marios Andreou
parent 0b59e2348d
commit a3eed8d45f
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
roles/overcloud-upgrade/templates/major-upgrade-overcloud-containers.sh.j2
View File

@ -39,7 +39,7 @@ openstack overcloud container image upload --verbose --config-file {{ working_di
{% endif %}
{% if target_upgrade_version in ['pike', 'queens', 'master'] %}
{% if target_upgrade_version in ['pike'] %}
echo "execute overcloud upgrade"
openstack overcloud deploy --templates {{ tht_dir }} \
@ -53,7 +53,6 @@ openstack overcloud deploy --templates {{ tht_dir }} \
-e {{ item }} \
{% endfor %}
if openstack stack show overcloud | grep "stack_status " | egrep "(CREATE|UPDATE)_COMPLETE"; then
openstack overcloud deploy --templates {{ tht_dir }} \
{{ deploy_args_used }} \
@ -67,6 +66,20 @@ if openstack stack show overcloud | grep "stack_status " | egrep "(CREATE|UPDAT
fi
{% else %}
echo "execute overcloud upgrade"
openstack overcloud upgrade --init-update --templates \
--container-registry-file {{ working_dir }}/containers-default-parameters.yaml \
-e ~/overcloud-repo.yaml
# TODO add per rolename
openstack overcloud upgrade --nodes Controller --playbook upgrade_steps_playbook.yaml
openstack overcloud upgrade --nodes Controller --playbook deploy_steps_playbook.yaml
openstack overcloud upgrade --nodes Controller --playbook post_upgrade_steps_playbook.yaml
# featureset has no compute yet... # openstack overcloud upgrade --nodes Compute
openstack overcloud upgrade --converge
{% endif %}