openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Use prepare command to build container images env file"

This commit is contained in:
Jenkins 2017-08-14 03:59:18 +00:00 committed by Gerrit Code Review
parent 72f78457f2 bc60d9f933
commit 6860a9967c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/tripleo.sh
View File

@ -611,6 +611,9 @@ parameter_defaults:
ControlPlaneSubnetCidr: 24
EOF_CAT
# generate container-images.yaml for tripleoupstream
openstack overcloud container image prepare --env-file $HOME/container-images.yaml
LOCAL_IP=${LOCAL_IP:-192.168.24.1}
cp -a /usr/share/openstack-tripleo-heat-templates ~/tripleo-heat-templates
@ -622,8 +625,8 @@ EOF_CAT
-e $HOME/tripleo-heat-templates/environments/services-docker/mistral.yaml \
-e $HOME/tripleo-heat-templates/environments/services-docker/zaqar.yaml \
-e $HOME/tripleo-heat-templates/environments/docker.yaml \
-e $HOME/tripleo-heat-templates/environments/docker-centos-tripleoupstream.yaml \
-e $HOME/tripleo-heat-templates/environments/mongodb-nojournal.yaml \
-e $HOME/container-images.yaml \
-e $HOME/custom.yaml
# the new installer requires root privs to avoid sudo'ing everything,

1
toci_gate_test-orig.sh
View File

@ -266,7 +266,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS \
-e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/docker-network.yaml \
-e /usr/share/openstack-tripleo-heat-templates/environments/docker-centos-tripleoupstream.yaml \
-e ~/containers-default-parameters.yaml"
;;
ovb)