openstack
/
tripleo-ci
Code Issues Proposed changes

Add a new docker centos Heat environment 

We are unsetting the t-h-t default params for containers in
Ice7b57c25248634240a6dd6e14e6d411e7806326. As part of that
we need to specify a new environment file explicitly
for tripleo-ci to continue using tripleoupstream containers.

Co-Authored-By: Ian Main <imain@redhat.com>

Change-Id: I4438d50f105000cbe38e017f1657d3ec6244c378
Depends-On: I125137ba45f608cf84ea0a7146edd744a549d23b
This commit is contained in:
Dan Prince 2017-06-30 14:44:02 -04:00
parent ce74b90174
commit d7d20c1820
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/tripleo.sh
View File

@ -617,6 +617,7 @@ 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/custom.yaml

1
toci_gate_test-orig.sh
View File

@ -272,6 +272,7 @@ 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)