commit 45951fa3d6835528ce0bb4ed07b3b5006f188b96
author Jan Cach <jcach@mirantis.com> Mon Jul 02 15:05:50 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Mon Jul 02 15:05:50 2018 +0000
tree 29eaca15ff7449cc1e2848da901092165bb9cc5d
parent c9ae338acd53abf3235c57cfb001c25d536427bf
parent 3d8970953360aaeafe3c51b13e09bcd70e1b7d08

Merge "Add default values for opencontrail stats + fix OC tag"

haproxy/proxy/listen/opencontrail/analytics.yml

diff --git a/haproxy/proxy/listen/opencontrail/analytics.yml b/haproxy/proxy/listen/opencontrail/analytics.yml
index fd20277..14890ca 100644
--- a/haproxy/proxy/listen/opencontrail/analytics.yml
+++ b/haproxy/proxy/listen/opencontrail/analytics.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    opencontrail_stats_password: password
   haproxy:
     proxy:
       listen:

haproxy/proxy/listen/opencontrail/control.yml

diff --git a/haproxy/proxy/listen/opencontrail/control.yml b/haproxy/proxy/listen/opencontrail/control.yml
index c389682..490d100 100644
--- a/haproxy/proxy/listen/opencontrail/control.yml
+++ b/haproxy/proxy/listen/opencontrail/control.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    opencontrail_stats_password: password
   haproxy:
     proxy:
       listen:

opencontrail/control/control4_0.yml

diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 6174379..e660e13 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -11,7 +11,7 @@
     opencontrail_message_queue_node01_address: ${_param:openstack_message_queue_node01_address}
     opencontrail_message_queue_node02_address: ${_param:openstack_message_queue_node02_address}
     opencontrail_message_queue_node03_address: ${_param:openstack_message_queue_node03_address}
-    opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller::${_param:opencontrail_image_tag}
+    opencontrail_controller_image: docker-prod-local.artifactory.mirantis.com/opencontrail-${_param:linux_repo_contrail_component}/opencontrail-controller:${_param:opencontrail_image_tag}
     opencontrail_controller_container_name: opencontrail_controller_1
     analytics_vip_address: ${_param:opencontrail_analytics_address}
   opencontrail: