Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235142
Change subject: Copy over ca-certificates to labs base image
......................................................................
Copy over ca-certificates to labs base image
With luck this will keep ldap/TLS happy on startup.
Bug: T110891
Change-Id: I8594d967e21d9f67732995f27f0f87dc62c372d7
---
M modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
M modules/labs_vmbuilder/files/postinst.copy
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/235142/1
diff --git a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
index 68f85e9..250794a 100644
--- a/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
+++ b/modules/labs_bootstrapvz/files/labs-jessie.manifest.yaml
@@ -185,6 +185,9 @@
-
src: /etc/apt/apt.conf.d/80security-ubuntu-proxy
dst: /etc/apt/apt.conf.d/80security-ubuntu-proxy
+ -
+ src: /etc/ssl/certs/ca-certificates.crt
+ dst: /etc/ssl/certs/ca-certificates.crt
image_commands:
# Current implementation does not specify an order between image_commands
and
# file_copy. This section should not depend on anything existing from
diff --git a/modules/labs_vmbuilder/files/postinst.copy
b/modules/labs_vmbuilder/files/postinst.copy
index 32209e6..f96559e 100644
--- a/modules/labs_vmbuilder/files/postinst.copy
+++ b/modules/labs_vmbuilder/files/postinst.copy
@@ -24,3 +24,4 @@
/etc/vmbuilder/files/vmbuilder_version /etc/wmflabs_imageversion
/etc/vmbuilder/files/cloud.cfg /etc/cloud/cloud.cfg
/etc/vmbuilder/firstscripts/firstboot.sh
/var/lib/cloud/scripts/per-instance/firstboot.sh
+/etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
--
To view, visit https://gerrit.wikimedia.org/r/235142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8594d967e21d9f67732995f27f0f87dc62c372d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
