Closes-Bug: #1570541 - SM support for External AMQP IP list

This check-in completes all scenarios of AMQP IP list config Including: Openstack Managed AMQP Configured Contrail AMQP List used by Cfgm and Ops nodes Configured Openstack AMQP List used only by Ops nodes Making Cfgm also use Openstack Managed AMQP Change-Id: I2a261a425b23786800fde7be835d339a65609b0c
Juniper · Apr 25, 2016 · d627d9d · d627d9d
1 parent beda2ce
commit d627d9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/compute/config.pp b/contrail/environment/modules/contrail/manifests/compute/config.pp
@@ -41,6 +41,7 @@
     $enable_dpdk=  $::contrail::params::enable_dpdk,
     $contrail_rabbit_servers = $::contrail::params::contrail_rabbit_servers,
     $openstack_rabbit_servers = $::contrail::params::openstack_rabbit_servers,
+    $openstack_amqp_ip_list = $::contrail::params::openstack_amqp_ip_list,
     $sriov = $::contrail::params::sriov,
 )  {
     $config_ip_to_use = $::contrail::params::config_ip_to_use
@@ -192,7 +193,7 @@
         Notify["vmware_physical_intf = ${vmware_physical_intf}"] ->Class['::contrail::compute::create_nfs']->Nova_config['neutron/admin_auth_url']
     }
 
-    if ($openstack_manage_amqp) {
+    if ($openstack_manage_amqp or $openstack_amqp_ip_list) {
         $nova_compute_rabbit_hosts = $openstack_rabbit_servers
     } else {
         $nova_compute_rabbit_hosts = $contrail_rabbit_servers

diff --git a/contrail/environment/modules/contrail/manifests/params.pp b/contrail/environment/modules/contrail/manifests/params.pp
@@ -768,12 +768,13 @@
     } else {
         $contrail_rabbit_port = '5672'
     }
-    if ($openstack_amqp_ip_list != '') {
+
+    if ($openstack_manage_amqp) {
+        $openstack_rabbit_ip_list = $openstack_ip_list
+    } elsif ($openstack_amqp_ip_list != '') {
         $openstack_rabbit_ip_list = $openstack_amqp_ip_list
     } elsif ($contrail_amqp_ip_list != '') {
         $openstack_rabbit_ip_list = $contrail_amqp_ip_list
-    } elsif ($openstack_manage_amqp) {
-        $openstack_rabbit_ip_list = $openstack_ip_list
     } else {
         $openstack_rabbit_ip_list = $config_ip_list
     }

diff --git a/contrail/environment/modules/contrail/manifests/rabbitmq.pp b/contrail/environment/modules/contrail/manifests/rabbitmq.pp
@@ -16,7 +16,7 @@
     $uuid = $::contrail::params::uuid,
 ) {
     # Check to see if amqp_ip_list was passed by user. If yes, rabbitmq provisioning can be skipped
-    if (! $contrail_amqp_ip_list) {
+    if (!$contrail_amqp_ip_list or ($openstack_manage_amqp and ($host_control_ip in $openstack_ip_list)) ) {
         if ($openstack_manage_amqp and ($host_control_ip in $openstack_ip_list)) {
             $amqp_ip_list = $openstack_ip_list
             $amqp_name_list = $openstack_name_list