commit 8bf50f4eaaa2e2b6e27b1d8f212b38e59164e5c5
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jan 21 15:26:50 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jan 21 15:26:50 2019 +0000
tree 70d9f38f9a6b789d7b91a532bd33dc83e9c815f8
parent 8833744bf227137ff1bd29793bbdfc06cbb17fa9
parent 5eed01f989f165de7a5871f9ac82acb828789251

Merge "use contrail admin for neutron+OC" into release/2019.2.0

opencontrail/control/cluster4_0.yml

diff --git a/opencontrail/control/cluster4_0.yml b/opencontrail/control/cluster4_0.yml
index 21d27f7..95b0d90 100644
--- a/opencontrail/control/cluster4_0.yml
+++ b/opencontrail/control/cluster4_0.yml
@@ -151,6 +151,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 8a02847..ba47959 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -109,6 +109,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