Faidon Liambotis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/215346

Change subject: certs: remove random certificates::* includes
......................................................................

certs: remove random certificates::* includes

These are all require()d from install_certificate, so external callers
are redundant. The exception to this is the GlobalSign CA, which was not
required by install_certificate before, so this was added now.

Change-Id: I84ed8671b363371993731a3fb709bfb0aec76a04
---
M manifests/certs.pp
M manifests/role/icinga.pp
M manifests/role/protoproxy.pp
M modules/base/manifests/init.pp
M modules/ldap/manifests/client.pp
M modules/ldap/manifests/role/client.pp
M modules/role/manifests/cache/ssl/misc.pp
M modules/role/manifests/cache/ssl/sni.pp
8 files changed, 4 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/215346/1

diff --git a/manifests/certs.pp b/manifests/certs.pp
index e817233..980aeac 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -6,11 +6,12 @@
     require certificates::base
     require certificates::rapidssl_ca
     require certificates::rapidssl_ca_2
+    require certificates::rapidssl_sha256_ca_G3
     require certificates::digicert_ca
     require certificates::digicert_sha2_ca
+    require certificates::globalsign_ca
     require certificates::wmf_ca
     require certificates::wmf_ca_2014_2017
-    require certificates::rapidssl_sha256_ca_G3
 
     sslcert::certificate { $name:
         group  => $group,
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index ae1002b..1ebaa94 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -25,7 +25,6 @@
     include mysql
     include icinga::gsbmonitoring
     include nrpe
-    include certificates::globalsign_ca
 
     if $ircbot {
         include icinga::ircbot
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index f92f916..e18414a 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -39,9 +39,8 @@
 
 class role::protoproxy::ssl::beta::common {
 
-    include standard,
-        certificates::wmf_labs_ca,
-        role::protoproxy::ssl::common
+    include standard
+    include role::protoproxy::ssl::common
 
     install_certificate { 'star.wmflabs.org':
         privatekey => false,
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 9a85398..6e06399 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -73,7 +73,6 @@
     include role::trebuchet
     include nrpe
 
-
     # include base::monitor::host.
     # if $nagios_contact_group is set, then use it
     # as the monitor host's contact group.
@@ -86,11 +85,4 @@
     class { 'base::monitoring::host':
         contact_group => $group_contact,
     }
-
-    # CA for the new ldap-eqiad/ldap-codfw ldap servers, among
-    # other things.
-    include certificates::globalsign_ca
-    # TODO: Kill the old wmf_ca
-    include certificates::wmf_ca
-    include certificates::wmf_ca_2014_2017
 }
diff --git a/modules/ldap/manifests/client.pp b/modules/ldap/manifests/client.pp
index 6069033..7708f3f 100644
--- a/modules/ldap/manifests/client.pp
+++ b/modules/ldap/manifests/client.pp
@@ -78,7 +78,6 @@
     file { '/etc/ldap.conf':
         notify  => Service['nscd'],
         content => template('ldap/nss_ldap.erb'),
-        require => Class['certificates::wmf_ca', 
'certificates::globalsign_ca'],
     }
 
     file { '/etc/nslcd.conf':
@@ -286,7 +285,6 @@
         group   => 'root',
         mode    => '0444',
         content => template('ldap/open_ldap.erb'),
-        require => Class['certificates::wmf_ca', 
'certificates::globalsign_ca'],
     }
 }
 
diff --git a/modules/ldap/manifests/role/client.pp 
b/modules/ldap/manifests/role/client.pp
index a5708e6..4f6a52c 100644
--- a/modules/ldap/manifests/role/client.pp
+++ b/modules/ldap/manifests/role/client.pp
@@ -3,10 +3,6 @@
 
     if ( $::realm == 'labs' ) {
         $includes = ['openldap', 'pam', 'nss', 'sudo', 'utils', 'access']
-
-        # Cert for the old virt1000/virt0 ldap servers:
-        include certificates::wmf_labs_ca
-
     } else {
         $includes = $ldapincludes
     }
diff --git a/modules/role/manifests/cache/ssl/misc.pp 
b/modules/role/manifests/cache/ssl/misc.pp
index 92945ce..cba2b3f 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -1,8 +1,5 @@
 # As above, but for misc instead of generic prod
 class role::cache::ssl::misc {
-    #TODO: kill the old wmf_ca
-    include certificates::wmf_ca
-    include certificates::wmf_ca_2014_2017
     include role::protoproxy::ssl::common
 
     role::cache::ssl::local { 'wikimedia.org':
diff --git a/modules/role/manifests/cache/ssl/sni.pp 
b/modules/role/manifests/cache/ssl/sni.pp
index 734b1b9..7c24a6a 100644
--- a/modules/role/manifests/cache/ssl/sni.pp
+++ b/modules/role/manifests/cache/ssl/sni.pp
@@ -1,7 +1,4 @@
 class role::cache::ssl::sni {
-    #TODO: kill the old wmf_ca
-    include certificates::wmf_ca
-    include certificates::wmf_ca_2014_2017
     include role::protoproxy::ssl::common
 
     role::cache::ssl::local { 'unified':

-- 
To view, visit https://gerrit.wikimedia.org/r/215346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84ed8671b363371993731a3fb709bfb0aec76a04
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to