openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add --tag parameter to image prepare command"

This commit is contained in:
Jenkins 2017-08-12 03:17:14 +00:00 committed by Gerrit Code Review
parent 9afbae298c 5de4a155cc
commit 1cd926df29
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,8 @@ sudo systemctl start docker
openstack overcloud container image prepare \
--env-file {{ working_dir }}/containers-default-parameters.yaml \
--namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }}
--namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
--tag {{ docker_image_tag }}
echo " DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
{{ working_dir }}/containers-default-parameters.yaml

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

@ -17,11 +17,13 @@ source {{ upgrade_working_dir }}/stackrc
openstack overcloud container image prepare \
--images-file {{ upgrade_working_dir }}/overcloud_containers.yaml \
--namespace {{ docker_registry_namespace }} \
--tag {{ docker_image_tag }} \
--push-destination {{ local_docker_registry_host }}:8787
openstack overcloud container image prepare \
--env-file ~/containers-default-parameters.yaml \
--namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }}
--namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
--tag {{ docker_image_tag }}
echo " DockerInsecureRegistryAddress: {{ local_docker_registry_host }}:8787" >> \
~/containers-default-parameters.yaml