[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment-prep: Commit hiera config for etcd
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/403205 ) Change subject: deployment-prep: Commit hiera config for etcd .. deployment-prep: Commit hiera config for etcd Change-Id: I1f6edcbb395f16980d28e8752c582c4bf34c7ff5 --- A files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt A hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml 2 files changed, 38 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt b/files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt new file mode 100644 index 000..d558ade --- /dev/null +++ b/files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt @@ -0,0 +1,28 @@ +-BEGIN CERTIFICATE- +MIIEvDCCAqSgAwIBAgIBWTANBgkqhkiG9w0BAQsFADBNMUswSQYDVQQDDEJQdXBw +ZXQgQ0E6IGRlcGxveW1lbnQtcHVwcGV0bWFzdGVyMDIuZGVwbG95bWVudC1wcmVw +LmVxaWFkLndtZmxhYnMwHhcNMTcwNDIwMTUyMDQ0WhcNMjIwNDIwMTUyMDQ0WjCB +jDErMCkGA1UEAwwiZXRjZC5kZXBsb3ltZW50LXByZXAuZXFpYWQud21mbGFiczEj +MCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xCzAJBgNVBAYTAlVT +MRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESMai98OOrwoib/ixxsSLIokPN3WumQ4g +l2z6GGhLDI0+IR/uK4naZQLGOLQy0p2EVdhnZlTxx+WYaxmCIxpZ7aOCATAwggEs +MDUGCWCGSAGG+EIBDQQoUHVwcGV0IFJ1YnkvT3BlblNTTCBJbnRlcm5hbCBDZXJ0 +aWZpY2F0ZTBzBgNVHREEbDBqgjBkZXBsb3ltZW50LWV0Y2QtMDEuZGVwbG95bWVu +dC1wcmVwLmVxaWFkLndtZmxhYnOCEmRlcGxveW1lbnQtZXRjZC0wMYIiZXRjZC5k +ZXBsb3ltZW50LXByZXAuZXFpYWQud21mbGFiczAOBgNVHQ8BAf8EBAMCBaAwIAYD +VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYD +VR0OBBYEFJjfXWXKPSufFNFaxjl7u/lc0Wj0MB8GA1UdIwQYMBaAFMKJmynijh7E +eMekzr7qlVTsJpIGMA0GCSqGSIb3DQEBCwUAA4ICAQBFwUzJigomN+sdUtTSfB6K +Q4Lj1d+igmmgJgaBQpFiYjU/HflnB8/DN4qf/CaV4qkQjsVLS8C+crewyZKBbujK +fzGyJbNafL5U0dmDWqeR8NXWOMsrJA05xNEoirdHlRp9sP9j44AjP6qH10NZNQ/r +0OfBcFtb8MF8cX+wGsUCBZPgRQWLFA8TInvkgtzDudGym3QVNC3ydujyiDnwMg9e +mkmRqsyHd/CudglIyK6GAcHNnieqdcZ/4yKaFNPmElbYK0czkucN0uXalbnMTuy3 +qkxYkRDOkYzItvsKgk24/EqYC3jtGXPf94sIpnsfOW8YKXJP2l2tsypQyZSHutPs +ug8m4Do4pynGvTofElDj3PaMKi84gvFIr+6SFd6ddLzqrnOi8WmrGnwSt+o/bSTM +SwbLvpQRqWiK0sw7d34w+F6CTeKc17mu3El1jUlolKkzZWB/lnECvFJnpdP3ixL/ +x2aV0jybf/OlyYRjW1Y7XwaXRcLv2FE4oAFomEyHGUTLBdVe3ZLhQfdAl2n4TtpW +HrD9iuV825nxvh9rYlfjcrPBUYZhIBKGKRIGBc2w05X57wrA4vt72D7Wv5UbTMce +if5WVI9Dqh0oQOvRrPrza05prTE25eGmNL1JBX7OfLwC2PsnNrxtKo9uwbCd+5Ea +WkcNvzOLPtv2FgOFlZNadg== +-END CERTIFICATE- diff --git a/hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml b/hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml new file mode 100644 index 000..7a1ce28 --- /dev/null +++ b/hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml @@ -0,0 +1,10 @@ +profile::etcd::discovery: "deployment-etcd-01=http://deployment-etcd-01.deployment-prep.eqiad.wmflabs:2380"; +profile::etcd::use_client_certs: false +profile::etcd::cluster_bootstrap: true +profile::etcd::use_proxy: true +profile::etcd::do_backup: false +profile::etcd::allow_from: "$DOMAIN_NETWORKS" +profile::etcd::tlsproxy::cert_name: "etcd.%{::domain}" +profile::etcd::tlsproxy::acls: { /: ["root"], /conftool: ["root", "conftool"],} +profile::etcd::tlsproxy::salt: "A9BwLWh0" +sslcert::certificate::chain: false -- To view, visit https://gerrit.wikimedia.org/r/403205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f6edcbb395f16980d28e8752c582c4bf34c7ff5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad Gerrit-Reviewer: BBlack Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Ema Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: deployment-prep: Commit hiera config for etcd
Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403205 ) Change subject: deployment-prep: Commit hiera config for etcd .. deployment-prep: Commit hiera config for etcd Change-Id: I1f6edcbb395f16980d28e8752c582c4bf34c7ff5 --- A files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt A hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml 2 files changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/05/403205/1 diff --git a/files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt b/files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt new file mode 100644 index 000..d558ade --- /dev/null +++ b/files/ssl/etcd.deployment-prep.eqiad.wmflabs.crt @@ -0,0 +1,28 @@ +-BEGIN CERTIFICATE- +MIIEvDCCAqSgAwIBAgIBWTANBgkqhkiG9w0BAQsFADBNMUswSQYDVQQDDEJQdXBw +ZXQgQ0E6IGRlcGxveW1lbnQtcHVwcGV0bWFzdGVyMDIuZGVwbG95bWVudC1wcmVw +LmVxaWFkLndtZmxhYnMwHhcNMTcwNDIwMTUyMDQ0WhcNMjIwNDIwMTUyMDQ0WjCB +jDErMCkGA1UEAwwiZXRjZC5kZXBsb3ltZW50LXByZXAuZXFpYWQud21mbGFiczEj +MCEGA1UECgwaV2lraW1lZGlhIEZvdW5kYXRpb24sIEluYy4xCzAJBgNVBAYTAlVT +MRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMFkw +EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAESMai98OOrwoib/ixxsSLIokPN3WumQ4g +l2z6GGhLDI0+IR/uK4naZQLGOLQy0p2EVdhnZlTxx+WYaxmCIxpZ7aOCATAwggEs +MDUGCWCGSAGG+EIBDQQoUHVwcGV0IFJ1YnkvT3BlblNTTCBJbnRlcm5hbCBDZXJ0 +aWZpY2F0ZTBzBgNVHREEbDBqgjBkZXBsb3ltZW50LWV0Y2QtMDEuZGVwbG95bWVu +dC1wcmVwLmVxaWFkLndtZmxhYnOCEmRlcGxveW1lbnQtZXRjZC0wMYIiZXRjZC5k +ZXBsb3ltZW50LXByZXAuZXFpYWQud21mbGFiczAOBgNVHQ8BAf8EBAMCBaAwIAYD +VR0lAQH/BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYD +VR0OBBYEFJjfXWXKPSufFNFaxjl7u/lc0Wj0MB8GA1UdIwQYMBaAFMKJmynijh7E +eMekzr7qlVTsJpIGMA0GCSqGSIb3DQEBCwUAA4ICAQBFwUzJigomN+sdUtTSfB6K +Q4Lj1d+igmmgJgaBQpFiYjU/HflnB8/DN4qf/CaV4qkQjsVLS8C+crewyZKBbujK +fzGyJbNafL5U0dmDWqeR8NXWOMsrJA05xNEoirdHlRp9sP9j44AjP6qH10NZNQ/r +0OfBcFtb8MF8cX+wGsUCBZPgRQWLFA8TInvkgtzDudGym3QVNC3ydujyiDnwMg9e +mkmRqsyHd/CudglIyK6GAcHNnieqdcZ/4yKaFNPmElbYK0czkucN0uXalbnMTuy3 +qkxYkRDOkYzItvsKgk24/EqYC3jtGXPf94sIpnsfOW8YKXJP2l2tsypQyZSHutPs +ug8m4Do4pynGvTofElDj3PaMKi84gvFIr+6SFd6ddLzqrnOi8WmrGnwSt+o/bSTM +SwbLvpQRqWiK0sw7d34w+F6CTeKc17mu3El1jUlolKkzZWB/lnECvFJnpdP3ixL/ +x2aV0jybf/OlyYRjW1Y7XwaXRcLv2FE4oAFomEyHGUTLBdVe3ZLhQfdAl2n4TtpW +HrD9iuV825nxvh9rYlfjcrPBUYZhIBKGKRIGBc2w05X57wrA4vt72D7Wv5UbTMce +if5WVI9Dqh0oQOvRrPrza05prTE25eGmNL1JBX7OfLwC2PsnNrxtKo9uwbCd+5Ea +WkcNvzOLPtv2FgOFlZNadg== +-END CERTIFICATE- diff --git a/hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml b/hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml new file mode 100644 index 000..7a1ce28 --- /dev/null +++ b/hieradata/labs/deployment-prep/host/deployment-etcd-01.yaml @@ -0,0 +1,10 @@ +profile::etcd::discovery: "deployment-etcd-01=http://deployment-etcd-01.deployment-prep.eqiad.wmflabs:2380"; +profile::etcd::use_client_certs: false +profile::etcd::cluster_bootstrap: true +profile::etcd::use_proxy: true +profile::etcd::do_backup: false +profile::etcd::allow_from: "$DOMAIN_NETWORKS" +profile::etcd::tlsproxy::cert_name: "etcd.%{::domain}" +profile::etcd::tlsproxy::acls: { /: ["root"], /conftool: ["root", "conftool"],} +profile::etcd::tlsproxy::salt: "A9BwLWh0" +sslcert::certificate::chain: false -- To view, visit https://gerrit.wikimedia.org/r/403205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1f6edcbb395f16980d28e8752c582c4bf34c7ff5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits