From d7d20c1820b95e66d00eebd242b57712282a427d Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 30 Jun 2017 14:44:02 -0400 Subject: [PATCH] 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 Change-Id: I4438d50f105000cbe38e017f1657d3ec6244c378 Depends-On: I125137ba45f608cf84ea0a7146edd744a549d23b --- scripts/tripleo.sh | 1 + toci_gate_test-orig.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh index f7ac7084c..8d3376c18 100755 --- a/scripts/tripleo.sh +++ b/scripts/tripleo.sh @@ -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 diff --git a/toci_gate_test-orig.sh b/toci_gate_test-orig.sh index d0d189191..f349450f6 100755 --- a/toci_gate_test-orig.sh +++ b/toci_gate_test-orig.sh @@ -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)