Remove deprecated rabbit params

Remove the deprecated rabbit params which has been deprecated for
two years. The default_transport_url has been present for a while
now and should be used.

Change-Id: I6b239ffca2184f553311428b92cd7043b4289b63

manifests/agents/ml2/linuxbridge.pp

@@ -172,9 +172,8 @@ class neutron::agents::ml2::linuxbridge (
     }
   }
 
-  if $::neutron::rpc_backend in [$::os_service_default, 'rabbit'] {
+  if $::neutron::default_transport_url  {
     $linuxbridge_agent_subscribe = [
-      Neutron_config['oslo_messaging_rabbit/rabbit_hosts'],
       Neutron_config['DEFAULT/transport_url']
     ]
   } else {

manifests/init.pp

@@ -333,29 +333,6 @@
 #   (optional) Maximum number of allowed address pairs per port
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*rabbit_password*]
-# [*rabbit_host*]
-# [*rabbit_port*]
-# [*rabbit_user*]
-#   (optional) Various rabbitmq settings
-#   Defaults to $::os_service_default
-#
-# [*rabbit_virtual_host*]
-#   (optional) virtualhost to use.
-#   Defaults to $::os_service_default
-#
-# [*rabbit_hosts*]
-#   (optional) array of rabbitmq servers for HA.
-#   A single IP address, such as a VIP, can be used for load-balancing
-#   multiple RabbitMQ Brokers.
-#   Defaults to $::os_service_default
-#
-# [*rpc_backend*]
-#   (optional) what rpc/queuing service to use
-#   Defaults to $::os_service_default
-#
 class neutron (
   $enabled                              = true,
   $package_ensure                       = 'present',
@@ -427,14 +404,6 @@ class neutron (
   $notification_topics                  = $::os_service_default,
   $notification_transport_url           = $::os_service_default,
   $max_allowed_address_pair             = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $rabbit_password                      = $::os_service_default,
-  $rabbit_host                          = $::os_service_default,
-  $rabbit_hosts                         = $::os_service_default,
-  $rabbit_port                          = $::os_service_default,
-  $rabbit_user                          = $::os_service_default,
-  $rabbit_virtual_host                  = $::os_service_default,
-  $rpc_backend                          = $::os_service_default,
 ) {
 
   include ::neutron::deps
@@ -467,19 +436,6 @@ class neutron (
     warning('kombu_missing_consumer_retry_timeout should not be longer than rpc_response_timeout')
   }
 
-  if !is_service_default($rabbit_host) or
-    !is_service_default($rabbit_hosts) or
-    !is_service_default($rabbit_password) or
-    !is_service_default($rabbit_port) or
-    !is_service_default($rabbit_user) or
-    !is_service_default($rabbit_virtual_host) or
-    !is_service_default($rpc_backend) {
-    warning("neutron::rabbit_host, neutron::rabbit_hosts, neutron::rabbit_password, \
-neutron::rabbit_port, neutron::rabbit_user, neutron::rabbit_virtual_host and \
-neutron::rpc_backend are deprecated. Please use neutron::default_transport_url \
-instead.")
-  }
-
   package { 'neutron':
     ensure => $package_ensure,
     name   => $::neutron::params::package_name,
@@ -535,9 +491,6 @@ instead.")
   }
 
   oslo::messaging::rabbit {'neutron_config':
-    rabbit_userid                        => $rabbit_user,
-    rabbit_password                      => $rabbit_password,
-    rabbit_virtual_host                  => $rabbit_virtual_host,
     heartbeat_timeout_threshold          => $rabbit_heartbeat_timeout_threshold,
     heartbeat_rate                       => $rabbit_heartbeat_rate,
     rabbit_use_ssl                       => $rabbit_use_ssl,
@@ -550,10 +503,7 @@ instead.")
     kombu_ssl_certfile                   => $kombu_ssl_certfile,
     kombu_ssl_keyfile                    => $kombu_ssl_keyfile,
     amqp_durable_queues                  => $amqp_durable_queues,
-    rabbit_hosts                         => $rabbit_hosts,
     rabbit_ha_queues                     => $rabbit_ha_queues,
-    rabbit_host                          => $rabbit_host,
-    rabbit_port                          => $rabbit_port,
     kombu_ssl_version                    => $kombu_ssl_version,
   }
 

releasenotes/notes/remove-deprecated-rabbit-params-9773d78c90d8965d.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The deprecated neutron::rabbit_host, neutron::rabbit_hosts, neutron::rabbit_password,
+    neutron::rabbit_port, neutron::rabbit_userid and neutron::rabit_virtual_host are now
+    removed. Please use neutron::default_transport_url instead.

spec/classes/neutron_agents_bigswitch.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::bigswitch' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :test_facts do

spec/classes/neutron_agents_dhcp_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::dhcp' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :params do

spec/classes/neutron_agents_l3_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::l3' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_agents_lbaas_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::lbaas' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :params do
@@ -117,7 +117,7 @@ describe 'neutron::agents::lbaas' do
       "package { 'haproxy':
          ensure => 'present'
        }
-      class { 'neutron': rabbit_password => 'passw0rd' }"
+      class { 'neutron': }"
     end
     before do
       params.merge!(:manage_haproxy_package => false)

spec/classes/neutron_agents_metadata_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::metadata' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :params do

spec/classes/neutron_agents_metering_spec.rb

@@ -24,7 +24,6 @@ describe 'neutron::agents::metering' do
 
   let :pre_condition do
     "class { 'neutron':
-      rabbit_password => 'passw0rd',
       service_plugins => ['neutron.services.metering.metering_plugin.MeteringPlugin'] }"
   end
 

spec/classes/neutron_agents_ml2_linuxbridge_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::ml2::linuxbridge' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_agents_ml2_ovs_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'neutron::agents::ml2::ovs' do
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_agents_ml2_sriov_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::ml2::sriov' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_agents_ml2_vpp_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'neutron::agents::ml2::vpp' do
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_agents_ovn_metadata_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::agents::ovn_metadata' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :params do

spec/classes/neutron_agents_vpnaas_spec.rb

@@ -23,7 +23,7 @@ require 'spec_helper'
 describe 'neutron::agents::vpnaas' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': }"
   end
 
   let :params do

spec/classes/neutron_init_spec.rb

@@ -6,7 +6,6 @@ describe 'neutron' do
     { :package_ensure        => 'present',
       :core_plugin           => 'ml2',
       :auth_strategy         => 'keystone',
-      :rabbit_password       => 'guest',
       :log_dir               => '/var/log/neutron',
       :purge_config          => false,
     }
@@ -27,20 +26,17 @@ describe 'neutron' do
     context 'and if rabbit_hosts parameter is provided' do
 
       context 'with one server' do
-        before { params.merge!( :rabbit_hosts => ['127.0.0.1:5672'] ) }
         it_configures 'a neutron base installation'
         it_configures 'rabbit HA with a single virtual host'
       end
 
       context 'with multiple servers' do
-        before { params.merge!( :rabbit_hosts => ['rabbit1:5672', 'rabbit2:5672'] ) }
         it_configures 'a neutron base installation'
         it_configures 'rabbit HA with multiple hosts'
       end
 
       context 'with rabbit_ha_queues set to false and with rabbit_hosts' do
-        before { params.merge!( :rabbit_ha_queues => 'false',
+        before { params.merge!( :rabbit_ha_queues => 'false' ) }
-                                :rabbit_hosts => ['rabbit:5673'] ) }
         it_configures 'rabbit_ha_queues set to false'
       end
 
@@ -123,10 +119,6 @@ describe 'neutron' do
     end
 
     it 'configures credentials for rabbit' do
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_userid').with_value( '<SERVICE DEFAULT>' )
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_password').with_value( params[:rabbit_password] )
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_password').with_secret( true )
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_virtual_host').with_value( '<SERVICE DEFAULT>' )
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value( '<SERVICE DEFAULT>' )
@@ -163,18 +155,17 @@ describe 'neutron' do
 
   shared_examples_for 'rabbit HA with a single virtual host' do
     it 'in neutron.conf' do
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_host').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts] )
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value('<SERVICE DEFAULT>')
     end
   end
 
   shared_examples_for 'rabbit HA with multiple hosts' do
+    before do
+      params.merge!(
+        :rabbit_ha_queues => true,
+      )
+    end
     it 'in neutron.conf' do
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_host').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_port').with_value('<SERVICE DEFAULT>')
-      is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_hosts').with_value( params[:rabbit_hosts].join(',') )
       is_expected.to contain_neutron_config('oslo_messaging_rabbit/rabbit_ha_queues').with_value(true)
     end
   end

spec/classes/neutron_plugins_cisco_spec.rb

@@ -7,7 +7,7 @@ describe 'neutron::plugins::cisco' do
       password => 'passw0rd',
      }
      class { 'neutron::server': }
-     class { 'neutron': rabbit_password => 'passw0rd' }"
+     class { 'neutron': }"
   end
 
   let :params do

spec/classes/neutron_plugins_midonet_spec.rb

@@ -7,7 +7,7 @@ describe 'neutron::plugins::midonet' do
       password => 'passw0rd',
      }
      class { 'neutron::server': }
-     class { 'neutron': rabbit_password => 'passw0rd' }"
+     class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_plugins_ml2_arista_l3_spec.rb

@@ -27,7 +27,6 @@ describe 'neutron::plugins::ml2::arista::l3' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_arista_spec.rb

@@ -27,7 +27,6 @@ describe 'neutron::plugins::ml2::arista' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_bigswitch_restproxy_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::bigswitch::restproxy' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_bigswitch_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::bigswitch' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::cisco::nexus1000v' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_cisco_nexus_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::cisco::nexus' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_cisco_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::cisco' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_cisco_type_nexus_vxlan_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::cisco::type_nexus_vxlan' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_cisco_vts_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::cisco::vts' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::fujitsu::cfab' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 

spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::fujitsu::fossw' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 

spec/classes/neutron_plugins_ml2_fujitsu_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::fujitsu' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 

spec/classes/neutron_plugins_ml2_mellanox_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::mellanox' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 

spec/classes/neutron_plugins_ml2_midonet_spec.rb

@@ -12,7 +12,6 @@ describe 'neutron::plugins::ml2::midonet' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_mlnx_sdn_assist_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::mellanox::mlnx_sdn_assist' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_nuage_spec.rb

@@ -4,7 +4,6 @@ describe 'neutron::plugins::ml2::nuage' do
 
   let :pre_condition do
     "class { '::neutron':
-       rabbit_password => 'passw0rd',
        core_plugin     => 'ml2' }
      class { '::neutron::keystone::authtoken':
        password => 'passw0rd',
@@ -67,7 +66,6 @@ describe 'neutron::plugins::ml2::nuage' do
     context 'configure ml2 nuage with wrong core_plugin configuration' do
       let :pre_condition do
         "class { 'neutron':
-          rabbit_password => 'passw0rd',
           core_plugin     => 'foo' }"
       end
 

spec/classes/neutron_plugins_ml2_opendaylight_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::opendaylight' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_ovn_spec.rb

@@ -7,7 +7,7 @@ describe 'neutron::plugins::ml2::ovn' do
       password => 'passw0rd',
      }
      class { 'neutron::server': }
-     class { 'neutron': rabbit_password => 'passw0rd' }"
+     class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_plugins_ml2_spec.rb

@@ -24,7 +24,6 @@ describe 'neutron::plugins::ml2' do
 
   let :pre_condition do
     "class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'ml2' }"
   end
 

spec/classes/neutron_plugins_ml2_vpp_spec.rb

@@ -8,7 +8,6 @@ describe 'neutron::plugins::ml2::vpp' do
      }
      class { 'neutron::server': }
      class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'neutron.plugins.ml2.plugin.Ml2Plugin' }"
   end
 

spec/classes/neutron_plugins_nsx_spec.rb

@@ -4,7 +4,6 @@ describe 'neutron::plugins::nsx' do
 
   let :pre_condition do
     "class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'vmware_nsx.plugin.NsxV3Plugin' }
       class { '::neutron::keystone::authtoken':
         password => 'passw0rd',
@@ -94,7 +93,6 @@ describe 'neutron::plugins::nsx' do
     context 'configure nsx with wrong core_plugin configure' do
       let :pre_condition do
         "class { 'neutron':
-          rabbit_password => 'passw0rd',
           core_plugin     => 'foo' }"
       end
 

spec/classes/neutron_plugins_nuage_spec.rb

@@ -4,7 +4,6 @@ describe 'neutron::plugins::nuage' do
 
   let :pre_condition do
     "class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'nuage_neutron.plugins.nuage.plugin.NuagePlugin' }
       class { '::neutron::keystone::authtoken':
         password => 'passw0rd',
@@ -63,7 +62,6 @@ describe 'neutron::plugins::nuage' do
     context 'configure nuage with wrong core_plugin configure' do
       let :pre_condition do
         "class { 'neutron':
-          rabbit_password => 'passw0rd',
           core_plugin     => 'foo' }"
       end
 

spec/classes/neutron_plugins_nvp_spec.rb

@@ -4,7 +4,6 @@ describe 'neutron::plugins::nvp' do
 
   let :pre_condition do
     "class { 'neutron':
-      rabbit_password => 'passw0rd',
       core_plugin     => 'neutron.plugins.nicira.NeutronPlugin.NvpPluginV2' }"
   end
 
@@ -90,7 +89,6 @@ describe 'neutron::plugins::nvp' do
     context 'configure nvp with wrong core_plugin configure' do
       let :pre_condition do
         "class { 'neutron':
-          rabbit_password => 'passw0rd',
           core_plugin     => 'foo' }"
       end
 

spec/classes/neutron_plugins_opencontrail_spec.rb

@@ -7,7 +7,7 @@ describe 'neutron::plugins::opencontrail' do
       password => 'passw0rd',
      }
      class { 'neutron::server': }
-     class { 'neutron': rabbit_password => 'passw0rd' }"
+     class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_plugins_plumgrid_spec.rb

@@ -7,7 +7,7 @@ describe 'neutron::plugins::plumgrid' do
       password => 'passw0rd',
      }
      class { 'neutron::server': }
-     class { 'neutron': rabbit_password => 'passw0rd' }"
+     class { 'neutron': }"
   end
 
   let :default_params do

spec/classes/neutron_server_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'neutron::server' do
 
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }
+    "class { 'neutron': }
      class { '::neutron::keystone::authtoken':
        password => 'passw0rd',
      }"
@@ -237,7 +237,7 @@ describe 'neutron::server' do
       end
 
       let :pre_condition do
-        "class { 'neutron': rabbit_password => 'passw0rd' }
+        "class { 'neutron': }
          include ::apache
          class { '::neutron::keystone::authtoken':
            password => 'passw0rd',

spec/classes/neutron_services_fwaas_spec.rb

@@ -22,7 +22,7 @@ require 'spec_helper'
 
 describe 'neutron::services::fwaas' do
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }
+    "class { 'neutron': }
      include ::neutron::agents::l3"
   end
 

spec/classes/neutron_services_l2gw_spec.rb

@@ -23,7 +23,7 @@ describe 'neutron::services::l2gw' do
       password => 'passw0rd',
      }
      class { 'neutron::server': }
-     class { 'neutron': rabbit_password => 'passw0rd' }"
+     class { 'neutron': }"
   end
 
   let :default_params do