From 1e6b7a08862b4a8ebe372fc5f3a46356181618f3 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 31 Jul 2018 16:04:36 +0200 Subject: Protect VMTP vs cidr conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It now runs vtmp via a new admin member. Else it fails due to cidr already used. It only creates a router and both tenant networks are still created by VMTP. Change-Id: I05ed41a3b7a01ee97c720176c404929bf8ea97a0 Signed-off-by: Cédric Ollivier --- docker/smoke/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/smoke') diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 695bee5f4..ff905e31b 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -4,7 +4,7 @@ ARG BRANCH=master ARG OPENSTACK_TAG=stable/queens ARG REFSTACK_TARGET=2017.09 ARG PATROLE_TAG=0.3.0 -ARG VMTP_TAG=9c016e3f9683ae557e8271ef358d9c1b59126cdf +ARG VMTP_TAG=refs/changes/59/588459/1 RUN apk --no-cache add --update libxml2 libxslt && \ apk --no-cache add --virtual .build-deps --update \ -- cgit 1.2.3-korg