Make an OpenStack Gerrit base class.

Change-Id: Ib16ff355199d330a74aaef384a11628b649f06ec

modules/openstack_project/manifests/gerrit.pp

@@ -0,0 +1,71 @@
+class openstack_project::gerrit (
+      $ssl_cert_file='',
+      $ssl_key_file='',
+      $ssl_chain_file='',
+      $email='',
+      $database_poollimit='',
+      $container_heaplimit='',
+      $core_packedgitopenfiles='',
+      $core_packedgitlimit='',
+      $core_packedgitwindowsize='',
+      $sshd_threads='',
+      $httpd_acceptorthreads='',
+      $httpd_minthreads='',
+      $httpd_maxthreads='',
+      $httpd_maxwait='',
+      $github_projects = [],
+      $upstream_projects = [],
+      $war,
+      $script_user,
+      $script_key_file,
+      $gerritbot_nick='',
+      $gerritbot_password='',
+      $gerritbot_server='',
+      $gerritbot_user='',
+      $github_user,
+      $github_token,
+      $mysql_password,
+      $email_private_key
+) {
+  class { 'openstack_project::server':
+    iptables_public_tcp_ports => [80, 443, 29418]
+  }
+
+  class { 'gerrit':
+    # opinions
+    virtual_hostname => $fqdn,
+    canonicalweburl => "https://$fqdn/",
+    logo => 'openstack.png',
+    script_site => 'openstack',
+    enable_melody => 'true',
+    melody_session => 'true',
+    # passthrough
+    ssl_cert_file => $ssl_cert_file,
+    ssl_key_file => $ssl_key_file,
+    ssl_chain_file => $ssl_chain_file,
+    email => $email,
+    database_poollimit => $database_poollimit,
+    container_heaplimit => $container_heaplimit,
+    core_packedgitopenfiles => $core_packedgitopenfiles,
+    core_packedgitlimit => $core_packedgitlimit,
+    core_packedgitwindowsize => $core_packedgitwindowsize,
+    sshd_threads => $sshd_threads,
+    httpd_acceptorthreads => $httpd_acceptorthreads,
+    httpd_minthreads => $httpd_minthreads,
+    httpd_maxthreads => $httpd_maxthreads,
+    httpd_maxwait => $httpd_maxwait,
+    github_projects => $github_projects,
+    upstream_projects => $upstream_projects,
+    war => $war,
+    script_user => $script_user,
+    script_key_file => $script_key_file,
+    gerritbot_nick => $gerritbot_nick,
+    gerritbot_password => $gerritbot_password,
+    gerritbot_server => $gerritbot_server,
+    gerritbot_user => $gerritbot_user,
+    github_user => $github_user,
+    github_token => $github_token,
+    mysql_password => $mysql_password,
+    email_private_key => $email_private_key
+  }
+}

modules/openstack_project/manifests/review.pp

@@ -25,12 +25,7 @@
 # 12:09 <@spearce> so. you get 5 milliseconds before aborting
 # thus, set it to 5000minutes until the bug is fixed.
 class openstack_project::review {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80, 443, 29418]
-  }
-  class { 'gerrit':
-    virtual_hostname => 'review.openstack.org',
-    canonicalweburl => "https://review.openstack.org/",
+  class { 'openstack_project::gerrit':
     ssl_cert_file => '/etc/ssl/certs/review.openstack.org.pem',
     ssl_key_file => '/etc/ssl/private/review.openstack.org.key',
     ssl_chain_file => '/etc/ssl/certs/intermediate.pem',
@@ -47,13 +42,9 @@ class openstack_project::review {
                          name => 'openstack-ci/gerrit',
                          remote => 'https://gerrit.googlesource.com/gerrit'
                          } ],
-    logo => 'openstack.png',
     war => 'http://tarballs.openstack.org/ci/gerrit-2.4.1-10-g63110fd.war',
     script_user => 'launchpadsync',
     script_key_file => '/home/gerrit2/.ssh/launchpadsync_rsa',
-    script_site => 'openstack',
-    enable_melody => 'true',
-    melody_session => 'true',
     gerritbot_nick => 'openstackgerrit',
     gerritbot_password => hiera('gerrit_gerritbot_password'),
     gerritbot_server => 'irc.freenode.net',

modules/openstack_project/manifests/review_dev.pp

@@ -1,11 +1,5 @@
 class openstack_project::review_dev {
-  class { 'openstack_project::server':
-    iptables_public_tcp_ports => [80, 443, 29418]
-  }
-
-  class { 'gerrit':
-    virtual_hostname => 'review-dev.openstack.org',
-    canonicalweburl => "https://review-dev.openstack.org/",
+  class { 'openstack_project::gerrit':
     ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
     ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',
     ssl_chain_file => '',
@@ -14,17 +8,9 @@ class openstack_project::review_dev {
                          name => 'gtest-org/test',
                          close_pull => 'true'
                          } ],
-    logo => 'openstack.png',
     war => 'http://tarballs.openstack.org/ci/gerrit-2.4.2-10-g93ffc27.war',
     script_user => 'update',
     script_key_file => '/home/gerrit2/.ssh/id_rsa',
-    script_site => 'openstack',
-    enable_melody => 'true',
-    melody_session => 'true',
-    gerritbot_nick => '',
-    gerritbot_password => '',
-    gerritbot_server => '',
-    gerritbot_user => '',
     github_user => 'openstack-gerrit-dev',
     github_token => hiera('gerrit_dev_github_token'),
     mysql_password => hiera('gerrit_dev_mysql_password'),