commit 2feace3de0d14c425ef7e2e683b52b2ee85616fd
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Dec 28 19:15:27 2018 +0000
committer Gerrit Code Review <mail@domain.com> Fri Dec 28 19:15:27 2018 +0000
tree b80b5824dbce063eafe3390be07f79b2fdaa99cd
parent c404694cccde3df08e4623d1aa558ff19ff4fd6f
parent a5610b2e5e29d3ab2bbc10a051cae2abeb8dafb0

Merge "OC4: mount webui redis config into container"

opencontrail/control/cluster4_0.yml

diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 1409a65..8d88e8c 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -145,6 +145,7 @@
               container_name: ${_param:opencontrail_controller_container_name}
               volumes:
                 - /etc/contrail:/etc/contrail
+                - /etc/redis/redis_webui.conf:/etc/redis/redis.conf
                 - /var/lib/configdb:/var/lib/cassandra
                 - /var/lib/config_zookeeper_data:/var/lib/zookeeper
                 - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid

opencontrail/control/control4_0.yml

diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 716088c..dfad397 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -105,6 +105,7 @@
               container_name: ${_param:opencontrail_controller_container_name}
               volumes:
                 - /etc/contrail:/etc/contrail
+                - /etc/redis/redis_webui.conf:/etc/redis/redis.conf
                 - /var/lib/configdb:/var/lib/cassandra
                 - /var/lib/config_zookeeper_data:/var/lib/zookeeper
                 - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid

opencontrail/control/single4_0.yml

diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index 726fa8f..9c11443 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -164,6 +164,7 @@
               container_name: ${_param:opencontrail_controller_container_name}
               volumes:
                 - /etc/contrail:/etc/contrail
+                - /etc/redis/redis_webui.conf:/etc/redis/redis.conf
                 - /var/lib/configdb:/var/lib/cassandra
                 - /var/lib/config_zookeeper_data:/var/lib/zookeeper
                 - /var/lib/zookeeper/myid:/var/lib/zookeeper/myid