From: Morgan Richomme <morgan.richomme@orange.com>
Date: Fri, 18 Aug 2017 08:31:51 +0000 (+0000)
Subject: Merge "Remove multisite support"
X-Git-Tag: 0.2~431
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=16b9a69410fd0aaa9a55b023997bb3872ee5907d;p=functest-xtesting.git

Merge "Remove multisite support"
---

16b9a69410fd0aaa9a55b023997bb3872ee5907d
diff --cc docker/Dockerfile
index 910be839,fe918527..2cbee665
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -14,9 -14,8 +14,8 @@@ LABEL version="0.1" description="OPNFV 
  # Environment variables
  ARG BRANCH=master
  ARG RALLY_TAG=0.8.1
 -ARG ODL_TAG=release/beryllium-sr4
 +ARG ODL_TAG=release/carbon
  ARG OPENSTACK_TAG=stable/ocata
- ARG KINGBIRD_TAG=1.1.0
  ARG VIMS_TAG=stable
  ARG VROUTER_TAG=stable
  ARG REPOS_DIR=/home/opnfv/repos