Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394320 )
Change subject: Don't use require_package for cergen
......................................................................
Don't use require_package for cergen
We need backport versions of dependencies installed before
cergen, but we require_package will fail the class
before those dependencies are installed.
Change-Id: Ib296ff666351a26eef7def674dce6c04878e2c37
---
M modules/profile/manifests/puppetmaster/frontend.pp
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/manifests/puppetmaster/frontend.pp
b/modules/profile/manifests/puppetmaster/frontend.pp
index adf91f9..be899ed 100644
--- a/modules/profile/manifests/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/puppetmaster/frontend.pp
@@ -34,18 +34,24 @@
if !defined(Package['python3-openssl']) {
package { 'python3-openssl':
ensure => '16.0.0-1~bpo8+1',
+ before => Package['cergen'],
}
}
if !defined(Package['python3-cryptography']) {
package { 'python3-cryptography':
ensure => '1.7.1-3~bpo8+1',
+ before => Package['cergen'],
}
}
}
# Ensure cergen is present for managing TLS keys and
# x509 certificates signed by the Puppet CA.
- require_package('cergen')
+ # Not using require_package since it fails the whole
+ # class if the above dependencies are not first installed.
+ package { 'cergen':
+ ensure => 'present',
+ }
}
## Configuration
--
To view, visit https://gerrit.wikimedia.org/r/394320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib296ff666351a26eef7def674dce6c04878e2c37
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
