Merge "barometer-collectd: Add support for DPDK in container"

diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv
index a5a092d..9319b9e 100644 (file)
--- a/docker/ansible/default.inv
+++ b/docker/ansible/default.inv
@@ -1,3 +1,12 @@
+# NOTE: for defining hosts both hostnames and IP addresses forms can be used
+# however it is advised to keep it consistent over the file, especially if
+# the same host is used by multiple containers
+# e.g. if some host will be described by IP address at first('127.0.0.1')
+# and at some place the same host will be called using its hostname
+# ('localhost') then ansible will treat them as different entities and
+# synchronization problems during parallel dependencies installation
+# may occur)
+
 [collectd_hosts]
 localhost
 

diff --git a/docs/release/userguide/docker.userguide.rst b/docs/release/userguide/docker.userguide.rst
index a666c13..c184abf 100644 (file)
--- a/docs/release/userguide/docker.userguide.rst
+++ b/docs/release/userguide/docker.userguide.rst
@@ -573,7 +573,7 @@ Build the collectd docker image
     $ git clone https://gerrit.opnfv.org/gerrit/barometer
     $ cd barometer/docker/barometer-collectd
     $ sudo docker build -t opnfv/barometer-collectd --build-arg http_proxy=`echo $http_proxy` \
-      --build-arg https_proxy=`echo $https_proxy` -f Dockerfile .
+      --build-arg https_proxy=`echo $https_proxy` --network=host -f Dockerfile .
 
 .. note::
    Main directory of barometer source code (directory that contains 'docker',
@@ -703,7 +703,7 @@ Build influxdb image from Dockerfile
 
   $ cd barometer/docker/barometer-influxdb
   $ sudo docker build -t opnfv/barometer-influxdb --build-arg http_proxy=`echo $http_proxy` \
-    --build-arg https_proxy=`echo $https_proxy` -f Dockerfile .
+    --build-arg https_proxy=`echo $https_proxy` --network=host -f Dockerfile .
 
 .. note::
    In the above mentioned ``docker build`` command, http_proxy & https_proxy arguments needs to