openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2018-02-13 20:50:12 +00:00 committed by Gerrit Code Review
parent 0cfbdb5435 a3eed8d45f
commit c044317d22
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 %}