openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Stop using deprecated --pull-source 

--pull-source has beed deprecated since it interacts poorly with
non-kolla images such as ceph. This change switches to fully-qualified
--namespace arguments instead.

Also the --exclude ceph is no longer required due to the service based
image filtering.

Change-Id: I7f7950ba7c95d42f23246932fb27f1ab457590d1
Related-Bug: #1708303
Related-Bug: #1714225
Closes-Bug: #1714412
This commit is contained in:
Steve Baker 2017-08-14 13:18:38 +12:00
parent bf0f2d3424
commit e8e41e2d9d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
View File

@ -18,10 +18,8 @@ set -eux
openstack overcloud container image prepare \
--images-file {{ working_dir }}/overcloud_containers.yaml \
{{ prepare_service_env_args }} \
--namespace {{ docker_registry_namespace }} \
--namespace {{ docker_registry_host }}/{{ docker_registry_namespace }} \
--tag {{ docker_image_tag }} \
--pull-source {{ docker_registry_host }} \
--exclude ceph \
--push-destination {{ local_docker_registry_host }}:8787
openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_containers.yaml

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

@ -17,7 +17,7 @@ source {{ upgrade_working_dir }}/stackrc
openstack overcloud container image prepare \
--images-file {{ upgrade_working_dir }}/overcloud_upgrade_containers.yaml \
-e {{ tht_dir }}/environments/docker.yaml \
--namespace {{ docker_registry_namespace }} \
--namespace {{ docker_registry_host }}/{{ docker_registry_namespace }} \
--tag {{ docker_image_tag }} \
--push-destination {{ local_docker_registry_host }}:8787