Merge "Stop using the Gerrit Contact Store"

doc/source/gerrit.rst

@@ -343,7 +343,6 @@ Next, edit `project.config` to look like::
   agreementUrl = static/cla.html
   autoVerify = group CLA Accepted - ICLA
   description = OpenStack Individual Contributor License Agreement
-  requireContactInformation = true
 
   [contributor-agreement "System CLA"]
   accepted = group System CLA
@@ -634,7 +633,7 @@ against the current DB contents:
   ssh review.openstack.org -p29418 gerrit flush-caches --all
 
 Make the user aware that these steps have also removed any group
-memberships, preferences, SSH keys, contact information, CLA
+memberships, preferences, SSH keys, CLA
 signatures, and so on associated with the old account so some of
 these may still need to be added to the new one via the Gerrit WebUI
 if they haven't been already. With a careful inspection of all

doc/source/running-your-own.rst

@@ -215,9 +215,6 @@ Migrate the manifests:
 
 * modules/openstack_project/manifests/review.pp.
 
-  * Contact store should be set to false as at this stage we don't have a
-    secure store setup.
-
   * Start with just local replication, plus github if you have a
     github organisation already.
 

manifests/site.pp

@@ -55,8 +55,6 @@ node 'review.openstack.org' {
     lp_access_token                     => hiera('gerrit_lp_access_token'),
     lp_access_secret                    => hiera('gerrit_lp_access_secret'),
     lp_consumer_key                     => hiera('gerrit_lp_consumer_key'),
-    contactstore_appsec                 => hiera('gerrit_contactstore_appsec'),
-    contactstore_pubkey                 => hiera('gerrit_contactstore_pubkey'),
     swift_username                      => hiera('swift_store_user', 'username'),
     swift_password                      => hiera('swift_store_key'),
     storyboard_password                 => hiera('gerrit_storyboard_token'),
@@ -79,8 +77,6 @@ node 'review-dev.openstack.org' {
     mysql_host                          => hiera('gerrit_dev_mysql_host', 'localhost'),
     mysql_password                      => hiera('gerrit_dev_mysql_password'),
     email_private_key                   => hiera('gerrit_dev_email_private_key'),
-    contactstore_appsec                 => hiera('gerrit_dev_contactstore_appsec'),
-    contactstore_pubkey                 => hiera('gerrit_dev_contactstore_pubkey'),
     ssh_dsa_key_contents                => hiera('gerrit_dev_ssh_dsa_key_contents'),
     ssh_dsa_pubkey_contents             => hiera('gerrit_dev_ssh_dsa_pubkey_contents'),
     ssh_rsa_key_contents                => hiera('gerrit_dev_ssh_rsa_key_contents'),

modules/openstack_project/manifests/gerrit.pp

@@ -43,10 +43,6 @@ class openstack_project::gerrit (
   $httpd_maxqueued = '',
   $httpd_maxwait = '',
   $war = '',
-  $contactstore = false,
-  $contactstore_appsec = '',
-  $contactstore_pubkey = '',
-  $contactstore_url = '',
   $acls_dir = 'UNDEF',
   $notify_impact_file = 'UNDEF',
   $projects_file = 'UNDEF',
@@ -169,10 +165,6 @@ class openstack_project::gerrit (
       },
     ],
     war                                 => $war,
-    contactstore                        => $contactstore,
-    contactstore_appsec                 => $contactstore_appsec,
-    contactstore_pubkey                 => $contactstore_pubkey,
-    contactstore_url                    => $contactstore_url,
     mysql_host                          => $mysql_host,
     mysql_password                      => $mysql_password,
     accountpatchreviewdb_url            => $accountpatchreviewdb_url,

modules/openstack_project/manifests/review.pp

@@ -74,11 +74,6 @@ class openstack_project::review (
   $lp_access_token='',
   $lp_access_secret='',
   $lp_consumer_key='',
-  # For gerrit's contactstore feature
-  # https://review.openstack.org/Documentation/config-contact.html
-  $contactstore = true,
-  $contactstore_appsec='',
-  $contactstore_pubkey='',
   # For openstackwatch.
   $swift_username = '',
   $swift_password = '',
@@ -130,11 +125,6 @@ class openstack_project::review (
     httpd_maxqueued                     => '200',
     war                                 =>
       'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.11.4.22.e0c0f29.war',
-    contactstore                        => $contactstore,
-    contactstore_appsec                 => $contactstore_appsec,
-    contactstore_pubkey                 => $contactstore_pubkey,
-    contactstore_url                    =>
-      'http://direct.openstack.org/verify/member/',
     acls_dir                            => $::project_config::gerrit_acls_dir,
     notify_impact_file                  => $::project_config::gerrit_notify_impact_file,
     projects_file                       => $::project_config::jeepyb_project_file,

modules/openstack_project/manifests/review_dev.pp

@@ -7,9 +7,6 @@ class openstack_project::review_dev (
   $mysql_host = '',
   $mysql_password = '',
   $email_private_key = '',
-  $contactstore = true,
-  $contactstore_appsec = '',
-  $contactstore_pubkey = '',
   $ssh_dsa_key_contents = '',
   $ssh_dsa_pubkey_contents = '',
   $ssh_rsa_key_contents = '',
@@ -63,11 +60,6 @@ class openstack_project::review_dev (
     email                               => 'review-dev@openstack.org',
     war                                 =>
       'http://tarballs.openstack.org/ci/gerrit/gerrit-v2.13.9.4.2a605d5.war',
-    contactstore                        => $contactstore,
-    contactstore_appsec                 => $contactstore_appsec,
-    contactstore_pubkey                 => $contactstore_pubkey,
-    contactstore_url                    =>
-      'https://review-dev.openstack.org/fakestore',
     acls_dir                            => $::project_config::gerrit_acls_dir,
     notify_impact_file                  => $::project_config::gerrit_notify_impact_file,
     projects_file                       => $::project_config::jeepyb_project_file,