openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "overcloud-prep-containers allow override of deploy args"

Browse Source
This commit is contained in:
Zuul 2018-02-12 00:43:39 +00:00 committed by Gerrit Code Review
commit 374e07a152
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,12 +31,14 @@ BUILD_ID={{ get_build_command }}
BUILD_ID={{ docker_image_tag }}
{% endif %}
PREPARE_ARGS=${PREPARE_ARGS:-"{{ prepare_service_env_args }}"}
## * Populate the docker registry
## ::
openstack overcloud container image prepare \
--images-file {{ working_dir }}/overcloud_containers.yaml \
{{ prepare_service_env_args }} \
${PREPARE_ARGS} \
--namespace {{ docker_registry_host }}/{{ docker_registry_namespace }} \
--tag $BUILD_ID \
{% if docker_prep_prefix is defined %}
@ -64,7 +66,7 @@ openstack overcloud container image upload --debug --config-file {{ working_dir
openstack overcloud container image prepare \
--images-file {{ working_dir }}/overcloud_containers.yaml \
--env-file {{ working_dir }}/containers-default-parameters.yaml \
{{ prepare_service_env_args }} \
${PREPARE_ARGS} \
--namespace {{ local_docker_registry_host }}:8787/{{ docker_registry_namespace }} \
{% if docker_prep_prefix is defined %}
--prefix={{ docker_prep_prefix}} \