From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 9 Sep 2018 06:54:17 +0000 (+0200)
Subject: [ovn-ha] ctl: neutron: Add msg cluster pillar
X-Git-Tag: opnfv-7.0.0~58
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F62015%2F1;p=fuel.git

[ovn-ha] ctl: neutron: Add msg cluster pillar

`system.neutron.control.cluster`, unlike
`system.neutron.control.openvswitch.cluster` does not provide
neutron:server:message_queue:members pillar data, letting it
default to the wrong values (single rabbit instance on the same node).

This led to neutron.conf on ctl nodes using:
`transport_url=rabbit://openstack:***@172.16.10.35:5672//openstack`
instead of
`transport_url=rabbit://openstack:***@172.16.10.28:5672,...//openstack`

Change-Id: Iad4b709d555b2bafafeb75fdecb831f7d4f5a504
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
index 795a7d892..64c16f031 100644
--- a/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml
@@ -33,8 +33,17 @@ parameters:
         mechanism:
           ovn:
             driver: ovn
+      compute:
+        region: ${_param:openstack_region}
       database:
         host: ${_param:opnfv_openstack_database_address}
+      identity:
+        region: ${_param:openstack_region}
+      message_queue:
+        members:
+          - host: ${_param:openstack_message_queue_node01_address}
+          - host: ${_param:openstack_message_queue_node02_address}
+          - host: ${_param:openstack_message_queue_node03_address}
       ovn_ctl_opts:
         db-nb-create-insecure-remote: 'yes'
         db-sb-create-insecure-remote: 'yes'