openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add converge step to the container upgrade"

This commit is contained in:
Jenkins 2017-08-19 05:37:31 +00:00 committed by Gerrit Code Review
parent d31d0866f1 9ab8f18138
commit ab17df4d04
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,13 +36,26 @@ echo " DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >>
echo "execute overcloud upgrade"
openstack overcloud deploy --templates {{ tht_dir }} \
{{ deploy_args_used }} \
-e {{ tht_dir }}/environments/docker.yaml \
-e {{ tht_dir }}/environments/major-upgrade-composable-steps-docker.yaml \
-e ~/containers-default-parameters.yaml \
-e ~/overcloud-repo.yaml \
{% for item in upgrade_custom_templates %}
-e {{ item }} \
{% endfor %}
-e {{ tht_dir }}/environments/docker.yaml
if openstack stack show overcloud | grep "stack_status " | egrep "(CREATE|UPDATE)_COMPLETE"; then
openstack overcloud deploy --templates {{ tht_dir }} \
{{ deploy_args_used }} \
-e {{ tht_dir }}/environments/major-upgrade-converge-docker.yaml \
-e ~/containers-default-parameters.yaml \
{% for item in upgrade_custom_templates %}
-e {{ item }} \
{% endfor %}
-e {{ tht_dir }}/environments/docker.yaml
fi
{% endif %}