Faidon Liambotis has submitted this change and it was merged.

Change subject: certs: replace require by collector ordering
......................................................................


certs: replace require by collector ordering

Change-Id: I6d999199d1a6da5727ad374f8a1f2b27a5ab6936
---
M manifests/certs.pp
M modules/base/manifests/certificates.pp
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Faidon Liambotis: Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/manifests/certs.pp b/manifests/certs.pp
index af09b3a..e3effe9 100644
--- a/manifests/certs.pp
+++ b/manifests/certs.pp
@@ -2,9 +2,6 @@
     $group     = 'ssl-cert',
     $privatekey=true,
 ) {
-
-    require base::certificates
-
     sslcert::certificate { $name:
         group  => $group,
         source => "puppet:///files/ssl/${name}.crt",
diff --git a/modules/base/manifests/certificates.pp 
b/modules/base/manifests/certificates.pp
index 2f41aec..7d8723c 100644
--- a/modules/base/manifests/certificates.pp
+++ b/modules/base/manifests/certificates.pp
@@ -22,4 +22,7 @@
     sslcert::ca { 'GlobalSign_Organization_Validation_CA_-_SHA256_-_G2':
         source  => 
'puppet:///modules/base/ca/GlobalSign_Organization_Validation_CA_-_SHA256_-_G2.crt',
     }
+
+    # install all CAs before generating certificates
+    Sslcert::Ca <| |> -> Sslcert::Certificate<| |>
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6d999199d1a6da5727ad374f8a1f2b27a5ab6936
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to