openstack
/
tripleo-ci
Code Issues Proposed changes

Don't use docker-network.yaml env 

All this network config does is create br-ex, which is now done in
docker/services/neutron-ovs-agent.yaml regardless of what network
config is used.

Change-Id: Ieb91ac7d7a799e303c3050f340c89103f2aeab55
Related-Bug: #1691403
Depends-On: Ie425148b0ad0f38e149c5fa0a97d98ec35d0a5bb
This commit is contained in:
Steve Baker 2017-08-25 15:26:17 +12:00 committed by Emilien Macchi
parent 9c71cf573b
commit dcb02ccca7
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tripleo.sh
View File

@ -109,7 +109,7 @@ if [ -f "$TRIPLEO_ROOT/tripleo-ci/deploy.env" ]; then
fi
ALL=${ALL:-""}
CONTAINER_ARGS=${CONTAINER_ARGS:-"-e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/docker-network.yaml --libvirt-type=qemu"}
CONTAINER_ARGS=${CONTAINER_ARGS:-"-e /usr/share/openstack-tripleo-heat-templates/environments/docker.yaml --libvirt-type=qemu"}
STABLE_RELEASE=${STABLE_RELEASE:-}
REVIEW_RELEASE=${REVIEW_RELEASE:-}
UPGRADE_RELEASE=${UPGRADE_RELEASE:-""}

1
toci_gate_test-orig.sh
View File

@ -259,7 +259,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
UNDERCLOUD_CONTAINERS=1
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 ~/containers-default-parameters.yaml"
;;
ovb)