From: Josh <jhershbe@redhat.com>
Date: Tue, 5 Apr 2016 08:39:53 +0000 (+0200)
Subject: OVS 2.5.1 docker image in fig.yml
X-Git-Tag: release/boron~398^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=55f3c913c7b8d74c42ef7aac1bc864301ad8b1bf;p=netvirt.git

OVS 2.5.1 docker image in fig.yml

Change-Id: Iefab500c304c99742c5ecd0877404c8ebbb10efb
Signed-off-by: Josh <jhershbe@redhat.com>
---

diff --git a/README b/README
index 9bd5064abd..5a18d8e945 100644
--- a/README
+++ b/README
@@ -108,13 +108,16 @@ To run the integration tests:
     # OSX
     mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=$(boot2docker ip 2>/dev/null) -Dovsdbserver.port=6640
     # Linux
-    mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=127.0.0.1 -Dovsdbserver.port=6640
+    mvn verify -Pintegrationtest -Dovsdbserver.ipaddress=127.0.0.1 -Dovsdbserver.port=6640 -Dovsdb.controller.address=<addr of docker interface> -Dovsdb.userspace.enabled=yes
     fig stop
 
 On Linux you'll generally need to run fig as root (sudo fig ...).
 
 If you're using Docker Compose, replace "fig" above with "docker-compose" and ignore the warnings.
 
+Running the docker image manually:
+    sudo docker run -itd --cap-add NET_ADMIN -p 6640:6640 jhershbe/centos7-ovs:latest
+
 Skipping unit tests and karaf tests
 ====================
 
diff --git a/fig.yml b/fig.yml
index 9c9a77a26b..08dc273480 100644
--- a/fig.yml
+++ b/fig.yml
@@ -1,6 +1,6 @@
 ovs:
- image: davetucker/docker-ovs:2.1.2
- ports: 
+ image: jhershbe/centos7-ovs:2.5.1
+ ports:
    - "6640:6640"
  command: "/usr/bin/supervisord -n"
  privileged: true