[ovn-ha] ctl: neutron: Add msg cluster pillar 15/62015/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 9 Sep 2018 06:54:17 +0000 (08:54 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 9 Sep 2018 07:02:02 +0000 (09:02 +0200)
`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>
mcp/reclass/classes/cluster/mcp-ovn-ha/openstack/control.yml

index 795a7d8..64c16f0 100644 (file)
@@ -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'