Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/406001 )

Change subject: add fake keys for wmcspuppetmaster to allow compiling
......................................................................

add fake keys for wmcspuppetmaster to allow compiling

Fix puppet compiling on nodes using the wmcspuppetmaster
role.

invalid secret wmcspuppetmaster/puppet_pubkey.pem at
/srv/jenkins-workspace/puppet-compiler/9808/change/src/modules/puppetmaster/manifests/web_frontend.pp

Change-Id: Ic32547e1389247ed1a7a63c7c9f8f9be9aab190a
---
A modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
A modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/01/406001/1

diff --git a/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem 
b/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
new file mode 100644
index 0000000..59df7d3
--- /dev/null
+++ b/modules/secret/secrets/wmcspuppetmaster/puppet_privkey.pem
@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+SNAKEOIL
+=======
+-----BEGIN RSA PRIVATE KEY-----
+SNAKEOIL
+-----BEGIN RSA PRIVATE KEY-----
+>>>>>>> 831c778... add fake puppet_priv/pubkey for wmcspuppetmaster to enable 
compiling
diff --git a/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem 
b/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
new file mode 100644
index 0000000..e3d82e0
--- /dev/null
+++ b/modules/secret/secrets/wmcspuppetmaster/puppet_pubkey.pem
@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+SNAKEOIL
+=======
+-----BEGIN CERTIFICATE-----
+SNAKEOIL
+-----END CERTIFICATE-----
+>>>>>>> 831c778... add fake puppet_priv/pubkey for wmcspuppetmaster to enable 
compiling

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic32547e1389247ed1a7a63c7c9f8f9be9aab190a
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Dzahn <dz...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to