diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 83f0fe0a29..c19dcd6b85 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -69,18 +69,7 @@ class gerrit($virtual_hostname='',
       $httpd_maxthreads='',
       $httpd_maxwait='',
       $github_projects = [],
-      $commentlinks = [ { name => 'changeid',
-                          match => '(I[0-9a-f]{8,40})',
-              		  link => '#q,$1,n,z' },
-
-                        { name => 'launchpad',
-			  match => '([Bb]ug|[Ll][Pp])[\\s#:]*(\\d+)',
-                          link => 'https://code.launchpad.net/bugs/$2' },
-
-                        { name => 'blueprint',
-                         match => '([Bb]lue[Pp]rint|[Bb][Pp])[\\s#:]*([A-Za-z0-9\\-]+)',
-                         link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2' },
-                  ],
+      $commentlinks = [],
       $logo,
       $war,
       $script_user,
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 546b199607..67d8bc7b7b 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -50,6 +50,18 @@ class openstack_project::gerrit (
     httpd_maxthreads => $httpd_maxthreads,
     httpd_maxwait => $httpd_maxwait,
     github_projects => $github_projects,
+    commentlinks => [ { name => 'changeid',
+                        match => '(I[0-9a-f]{8,40})',
+                        link => '#q,$1,n,z' },
+
+                      { name => 'launchpad',
+                        match => '([Bb]ug|[Ll][Pp])[\\s#:]*(\\d+)',
+                        link => 'https://code.launchpad.net/bugs/$2' },
+
+                      { name => 'blueprint',
+                       match => '([Bb]lue[Pp]rint|[Bb][Pp])[\\s#:]*([A-Za-z0-9\\-]+)',
+                       link => 'https://blueprints.launchpad.net/openstack/?searchtext=$2' },
+                  ],
     war => $war,
     script_user => $script_user,
     script_key_file => $script_key_file,