openstack
/
tripleo-upgrade
Code Issues Proposed changes

Remove the --container-registry-file parameter from upgrade clis 

See topic branch at [0] for related reviews. The container registry file
parameter is being removed and replaced by regular -e to include the
container images as an environment file

[0] https://review.openstack.org/#/q/topic:remove-container-registry-file

Change-Id: Ief17a16aad82f0690cdde24b028312f24b3285b7
This commit is contained in:
mandreou 2018-06-05 10:21:42 +03:00 committed by Marius Cornea
parent 40e08464f8
commit a66ee2c7c2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/ceph-update-run.sh.j2
View File

@ -19,6 +19,6 @@ openstack overcloud ceph-upgrade run \
{% if tripleo_upgrade_validations_non_fatal|bool %}
--validation-errors-nonfatal \
{% endif %}
--container-registry-file {{ working_dir }}/{{ container_registry_file }} \
-e {{ working_dir }}/{{ container_registry_file }} \
echo "[$(date)] Finished CEPH minor update"

2
templates/ceph-upgrade-run.sh.j2
View File

@ -23,7 +23,7 @@ openstack overcloud ceph-upgrade run \
{% if tripleo_upgrade_validations_non_fatal|bool %}
--validation-errors-nonfatal \
{% endif %}
--container-registry-file {{ working_dir }}/{{ container_registry_file }} \
-e {{ working_dir }}/{{ container_registry_file }} \
{% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1
echo "[$(date)] Finished CEPH upgrade"

2
templates/overcloud_update_prepare.sh.j2
View File

@ -21,4 +21,4 @@ openstack overcloud update prepare --templates {{ tht_directory }} \
{% endfor %}
{% endif %}
--roles-file {{ roles_data }} \
--container-registry-file {{ working_dir }}/{{ container_registry_file }} 2>&1
-e {{ working_dir }}/{{ container_registry_file }} 2>&1

2
templates/overcloud_upgrade_prepare.sh.j2
View File

@ -21,7 +21,6 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
{% if tripleo_upgrade_validations_non_fatal|bool %}
--validation-errors-nonfatal \
{% endif %}
--container-registry-file {{ working_dir }}/{{ container_registry_file }} \
{% if initial_env_file is defined and initial_env_file.stdout_lines|length > 0 %}
{% for _env in initial_env_file.stdout_lines %}
-e {{ _env }} \
@ -36,4 +35,5 @@ openstack overcloud{% if ffu_overcloud_upgrade %} ffwd-upgrade {% else %} upgrad
{% if upgrade_prepare_extra_params %}
-e {{ upgrade_prepare_extra_params | join(' -e ') }} \
{% endif %}
-e {{ working_dir }}/{{ container_registry_file }} \
{% if not ffu_overcloud_upgrade %}--roles-file {{ roles_data }}{% endif %} 2>&1