openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Add a new docker centos Heat environment"

This commit is contained in:
Jenkins 2017-07-13 01:42:24 +00:00 committed by Gerrit Code Review
parent 201918df96 d7d20c1820
commit c4045e3c16
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)