Small fix to select rpc_backend='rabbit'

manifests/profile/ceilometer/common.pp

@@ -13,7 +13,7 @@ class iaas::profile::ceilometer::common (
     metering_secret => $secret,
 #added rabbit_hosts
 #    rabbit_hosts => [ $endpoint ],
-#    rpc_backend => 'rabbit',
+    rpc_backend => 'rabbit',
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,

manifests/profile/cinder.pp

@@ -27,7 +27,7 @@ class iaas::profile::cinder (
     database_connection => $iaas::resources::connectors::cinder,
 #Added rabbit_hosts
 #    rabbit_host => $endpoint,
-#    rpc_backend => 'rabbit',
+    rpc_backend => 'rabbit',
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
@@ -57,9 +57,15 @@ class iaas::profile::cinder (
   }
 
   class { '::cinder::scheduler':
+#    scheduler_driver => 'cinder.scheduler.simple.SimpleScheduler',
     scheduler_driver => 'cinder.scheduler.filter_scheduler.FilterScheduler',
   }
 
+#  class { '::cinder::setup_test_volume':
+#    volume_name => 'cinder-volumes',
+#    size => $volume_size
+#  } ->
+
   class { '::cinder::volume': }
 
   class { '::cinder::volume::rbd':

manifests/profile/heat.pp

@@ -43,7 +43,7 @@ class iaas::profile::heat (
 
 #added rabbit_hosts
 #    rabbit_host => $endpoint,
-#    rpc_backend => "rabbit",
+    rpc_backend => "rabbit",
     rabbit_hosts => $rhosts,
     rabbit_userid => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,

manifests/profile/neutron/common.pp

 class iaas::profile::neutron::common (
   $core_plugin = undef,
   $service_plugins = undef,
+  $public_interface = hiera('iaas::public_interface', undef),
+  $admin_interface = hiera('iaas::admin_interface', undef),
+
+#verbose, debug
+  $verbose = hiera('iaas::verbose', undef),
+  $debug = hiera('iaas::debug', undef),
 
   $region = hiera('iaas::region', undef),
   $endpoint = hiera('iaas::role::endpoint::main_address', undef),
-#Costa - added $rhosts
+#added $rhosts
   $rhosts = hiera('iaas::profile::rabbitmq::rhosts', undef),
   $rabbitmq_user = hiera('iaas::profile::rabbitmq::user', undef),
   $rabbitmq_password = hiera('iaas::profile::rabbitmq::password', undef),
 ) {
-#Costa
-#  file { 'etc_default_neutron-server':
-#    path => '/etc/default/neutron-server',
-#    ensure => 'present'
-#  }
+
+  file { 'etc_default_neutron-server':
+    path => '/etc/default/neutron-server',
+    ensure => 'present'
+  }
 
   class { '::neutron':
+#added verbose, debug
+    verbose => $verbose,
+    debug => $debug,
+
+    bind_host => $::facts["ipaddress_${admin_interface}"],
     core_plugin => $core_plugin,
     allow_overlapping_ips => true,
-#Costa - added rabbit_hosts
+#added rabbit_hosts
 #    rabbit_host => $endpoint,
+    rpc_backend => "rabbit",    
     rabbit_hosts => $rhosts,
     rabbit_user => $rabbitmq_user,
     rabbit_password => $rabbitmq_password,
     service_plugins => $service_plugins,
+    dhcp_agents_per_network => 2
   }
 
   class  { '::neutron::plugins::ml2':