commit 2e2547216d1aafb343931ff79fb38e8beda3eaee
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Nov 07 14:14:11 2018 +0000
committer Gerrit Code Review <mail@domain.com> Wed Nov 07 14:14:11 2018 +0000
tree b24a12401c80d0a1fd5deb69cdc4d6f5ab93d473
parent 5b926404ba3321683e40aca84ac418ba047ac331
parent 242b2d1b5ba5aa1d346688f0954583b591104ea2

Merge "Add Ironic metadata for memcache security strategy"

docker/swarm/stack/monitoring/elasticsearch_client_node.yml

diff --git a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
index d642dd2..8380377 100644
--- a/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
+++ b/docker/swarm/stack/monitoring/elasticsearch_client_node.yml
@@ -36,7 +36,7 @@
                 xpack.monitoring.enabled: "false"
                 bootstrap.memory_lock: "false"
                 discovery.zen.minimum_master_nodes: 2
-                discovery.zen.ping.unicast.hosts: ${_param:stacklight_monitor_address}
+                discovery.zen.ping.unicast.hosts: ${_param:stacklight_log_address}
               labels:
                 com.mirantis.monitoring: "elasticsearch"
               image: ${_param:docker_image_elasticsearch}

opencontrail/control/analytics.yml

diff --git a/opencontrail/control/analytics.yml b/opencontrail/control/analytics.yml
index 36781c2..7471997 100644
--- a/opencontrail/control/analytics.yml
+++ b/opencontrail/control/analytics.yml
@@ -36,6 +36,8 @@
       role: ${_param:opencontrail_node_role}
       discovery:
         host: ${_param:opencontrail_control_address}
+      identity:
+        host: ${_param:openstack_control_address}
     database:
       discovery:
         host: ${_param:opencontrail_control_address}