diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index f4b48b374f..88e6c02b5e 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -23,10 +23,10 @@ class openstack_project::gerrit (
       $httpd_maxthreads='',
       $httpd_maxwait='',
       $war,
-      $contactstore,
-      $contactstore_appsec,
-      $contactstore_pubkey,
-      $contactstore_url,
+      $contactstore=false,
+      $contactstore_appsec='',
+      $contactstore_pubkey='',
+      $contactstore_url='',
       $cla_description='OpenStack Individual Contributor License Agreement',
       $cla_file='static/cla.html',
       $cla_id='2',
diff --git a/modules/openstack_project/manifests/review_dev.pp b/modules/openstack_project/manifests/review_dev.pp
index cdfa08cef9..6974897ab8 100644
--- a/modules/openstack_project/manifests/review_dev.pp
+++ b/modules/openstack_project/manifests/review_dev.pp
@@ -5,6 +5,10 @@ class openstack_project::review_dev (
   $email_private_key,
   $contactstore_appsec,
   $contactstore_pubkey,
+  $cla_description=$openstack_project::gerrit::cla_description,
+  $cla_file=$openstack_project::gerrit::cla_file,
+  $cla_id=$openstack_project::gerrit::cla_id,
+  $cla_name=$openstack_project::gerrit::cla_name,
   $sysadmins = []
 ) {
   class { 'openstack_project::gerrit':