diff --git a/manifests/rbd.pp b/manifests/rbd.pp
index 36fb6d05..499b6762 100644
--- a/manifests/rbd.pp
+++ b/manifests/rbd.pp
@@ -12,18 +12,21 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
+#
 
 class privatecloud::rbd (
-  $fsid,
-  $auth_type = 'cephx',
-  $release = 'cuttlefish'
+  $fsid            = $os_params::ceph_fsid,
+  $auth_type       = 'cephx',
+  $release         = 'cuttlefish',
+  $cluster_network = $os_params::ceph_cluster_network,
+  $public_network  = $os_params::ceph_public_network
 ) {
 
   class { 'ceph::conf':
-    fsid            => $os_params::ceph_fsid,
+    fsid            => $fsid,
     auth_type       => $auth_type,
-    cluster_network => $os_params::ceph_cluster_network,
-    public_network  => $os_params::ceph_public_network,
+    cluster_network => $cluster_network,
+    public_network  => $public_network,
   }
 
 }
diff --git a/manifests/rbd/monitor.pp b/manifests/rbd/monitor.pp
index 1775143a..b313e2e6 100644
--- a/manifests/rbd/monitor.pp
+++ b/manifests/rbd/monitor.pp
@@ -17,15 +17,17 @@
 #
 
 class privatecloud::rbd::monitor (
-  $id
+  $id,
+  $mon_addr       => $ipaddress_eth0,
+  $monitor_secret => $os_params::ceph_mon_secret
 ) {
 
   include 'privatecloud::rbd'
 
   ceph::mon { $id:
-    monitor_secret => $os_params::ceph_mon_secret,
+    monitor_secret => $monitor_secret,
     mon_port       => 6789,
-    mon_addr       => $ipaddress_eth0,
+    mon_addr       => $mon_addr,
   }
 
 }