diff --git a/manifests/compute/controller.pp b/manifests/compute/controller.pp
index 8fb92836..e02f66af 100644
--- a/manifests/compute/controller.pp
+++ b/manifests/compute/controller.pp
@@ -23,6 +23,8 @@ class privatecloud::compute::controller(
   $local_ip                             = $ipaddress_eth0,
 ){
 
+  include 'privatecloud::compute'
+
   class { [
     'nova::scheduler',
     'nova::cert',
diff --git a/manifests/compute/hypervisor.pp b/manifests/compute/hypervisor.pp
index c230ebaf..85087453 100644
--- a/manifests/compute/hypervisor.pp
+++ b/manifests/compute/hypervisor.pp
@@ -21,6 +21,8 @@ class privatecloud::compute::hypervisor(
   $libvirt_type      = 'kvm',
 ) {
 
+  include 'privatecloud::compute'
+
   exec { 'insert_module_nbd':
     command => '/bin/echo "nbd" > /etc/modules',
     unless  => '/bin/grep "nbd" /etc/modules',
diff --git a/manifests/network/compute.pp b/manifests/network/compute.pp
index 46affa30..1fd55076 100644
--- a/manifests/network/compute.pp
+++ b/manifests/network/compute.pp
@@ -22,6 +22,8 @@ class privatecloud::network::compute(
   $neutron_password = $os_params::ks_neutron_password,
 ) {
 
+  include 'privatecloud::network'
+
   class { 'nova::network::neutron':
       neutron_admin_password => $neutron_password,
       neutron_admin_auth_url => "${neutron_protocol}://${neutron_endpoint}:35357/v2.0",
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 5756b8bb..1f537ef1 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -26,6 +26,8 @@ class privatecloud::network::controller(
   $local_ip                = $ipaddress_eth0,
 ) {
 
+  include 'privatecloud::network'
+
   $encoded_user = uriescape($neutron_db_user)
   $encoded_password = uriescape($neutron_db_password)
 
diff --git a/manifests/network/dhcp.pp b/manifests/network/dhcp.pp
index 90267317..601aebd5 100644
--- a/manifests/network/dhcp.pp
+++ b/manifests/network/dhcp.pp
@@ -20,6 +20,8 @@ class privatecloud::network::dhcp(
   $debug   = $os_params::debug
 ) {
 
+  include 'privatecloud::network'
+
   class { 'neutron::agents::dhcp':
     debug   => $debug
   }
diff --git a/manifests/network/l3.pp b/manifests/network/l3.pp
index 5c6c8749..10c82ca1 100644
--- a/manifests/network/l3.pp
+++ b/manifests/network/l3.pp
@@ -21,6 +21,8 @@ class privatecloud::network::l3(
   $debug        = $os_params::debug,
 ) {
 
+  include 'privatecloud::network'
+
   class { 'neutron::agents::l3':
     debug                        => $debug,
     handle_internal_only_routers => false,
diff --git a/manifests/network/lbaas.pp b/manifests/network/lbaas.pp
index bea79875..3936ce0f 100644
--- a/manifests/network/lbaas.pp
+++ b/manifests/network/lbaas.pp
@@ -20,6 +20,8 @@ class privatecloud::network::lbaas(
   $debug                 = $os_params::debug
 ) {
 
+  include 'privatecloud::network'
+
   class { 'neutron::agents::lbaas':
     debug         => $debug,
   }
diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp
index 11b1db7d..42fe15aa 100644
--- a/manifests/network/metadata.pp
+++ b/manifests/network/metadata.pp
@@ -28,6 +28,8 @@ class privatecloud::network::metadata(
   $ks_keystone_admin_host               = $os_params::ks_keystone_admin_host
 ) {
 
+  include 'privatecloud::network'
+
   class { 'neutron::agents::metadata':
     enabled       => $enabled,
     shared_secret => $neutron_metadata_proxy_shared_secret,
diff --git a/manifests/network/vpn.pp b/manifests/network/vpn.pp
index 020d70d5..52a8bf55 100644
--- a/manifests/network/vpn.pp
+++ b/manifests/network/vpn.pp
@@ -20,6 +20,8 @@ class privatecloud::network::vpn(
   $debug                 = $os_params::debug
 ) {
 
+  include 'privatecloud::network'
+
   class { 'neutron::agents::vpnaas': }
 
 }
diff --git a/manifests/object/storage.pp b/manifests/object/storage.pp
index f3763262..a0104023 100644
--- a/manifests/object/storage.pp
+++ b/manifests/object/storage.pp
@@ -36,6 +36,8 @@ class privatecloud::object::storage (
   $onloopdevices  = false,
 ) {
 
+  include 'privatecloud::object'
+
   class { 'swift::storage':
     storage_local_net_ip => $local_ip,
   }
diff --git a/manifests/orchestration/api.pp b/manifests/orchestration/api.pp
index 37b7026b..9bb1563b 100644
--- a/manifests/orchestration/api.pp
+++ b/manifests/orchestration/api.pp
@@ -23,6 +23,8 @@ class privatecloud::orchestration::api(
   $local_ip                        = $ipaddress_eth0,
 ) {
 
+  include 'privatecloud::orchestration'
+
   class { 'heat::api': }
 
   class { 'heat::api_cfn': }
diff --git a/manifests/orchestration/engine.pp b/manifests/orchestration/engine.pp
index f044777d..ce0e1e8d 100644
--- a/manifests/orchestration/engine.pp
+++ b/manifests/orchestration/engine.pp
@@ -24,6 +24,8 @@ class privatecloud::orchestration::engine(
   $ks_heat_password           = $os_params::ks_heat_password,
 ) {
 
+  include 'privatecloud::orchestration'
+
   class { 'heat::engine':
     enabled                       => $enabled,
     heat_metadata_server_url      => "${ks_heat_public_proto}://${ks_heat_public_host}:8000",
diff --git a/manifests/rbd/monitor.pp b/manifests/rbd/monitor.pp
index 6fb6aa5c..1775143a 100644
--- a/manifests/rbd/monitor.pp
+++ b/manifests/rbd/monitor.pp
@@ -20,9 +20,12 @@ class privatecloud::rbd::monitor (
   $id
 ) {
 
+  include 'privatecloud::rbd'
+
   ceph::mon { $id:
     monitor_secret => $os_params::ceph_mon_secret,
     mon_port       => 6789,
-    mon_addr       => $ipaddress_eth2,
+    mon_addr       => $ipaddress_eth0,
   }
+
 }
diff --git a/manifests/rbd/osd.pp b/manifests/rbd/osd.pp
index d2da77c7..08d2b25d 100644
--- a/manifests/rbd/osd.pp
+++ b/manifests/rbd/osd.pp
@@ -21,6 +21,8 @@ class privatecloud::rbd::osd (
   $devices
 ) {
 
+  include 'privatecloud::rbd'
+
   class { 'ceph::osd' :
     public_address  => $public_address,
     cluster_address => $cluster_address,
diff --git a/manifests/telemetry/centralagent.pp b/manifests/telemetry/centralagent.pp
index 7150e6d4..e75a2a76 100644
--- a/manifests/telemetry/centralagent.pp
+++ b/manifests/telemetry/centralagent.pp
@@ -21,6 +21,8 @@ class privatecloud::telemetry::centralagent(
   $enabled = true,
 ){
 
+  include 'privatecloud::telemetry'
+
   class { 'ceilometer::agent::central':
     enabled => $enabled,
   }
diff --git a/manifests/telemetry/server.pp b/manifests/telemetry/server.pp
index f1412e71..fe1c0e3c 100644
--- a/manifests/telemetry/server.pp
+++ b/manifests/telemetry/server.pp
@@ -25,6 +25,8 @@ class privatecloud::telemetry::server(
   $local_ip                       = $ipaddress_eth0,
 ){
 
+  include 'privatecloud::telemetry'
+
 # Install MongoDB database
   class { 'ceilometer::db':
     database_connection => $ceilometer_database_connection,
diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp
index 608d4920..af653146 100644
--- a/manifests/volume/controller.pp
+++ b/manifests/volume/controller.pp
@@ -26,6 +26,8 @@ class privatecloud::volume::controller(
   $local_ip                  = $ipaddress_eth0,
 ) {
 
+  include 'privatecloud::volume'
+
   class { 'cinder::scheduler': }
 
   class { 'cinder::api':
diff --git a/manifests/volume/storage.pp b/manifests/volume/storage.pp
index a9dfea3f..6e6b89ca 100644
--- a/manifests/volume/storage.pp
+++ b/manifests/volume/storage.pp
@@ -18,6 +18,8 @@
 
 class privatecloud::volume::storage {
 
+  include 'privatecloud::volume'
+
   class { 'cinder::volume::rbd':
     rbd_pool           => $os_params::cinder_rbd_pool,
     glance_api_version => $os_params::glance_api_version,