Andrew Bogott has submitted this change and it was merged.

Change subject: Issue new certificate for virt-star
......................................................................


Issue new certificate for virt-star

Following the issuing of labvirt-star in
https://gerrit.wikimedia.org/r/204612 and the discussion in T96291,
issue a new certificate from wmf_ca_2014_2017 for virt-star

Bug: T96291
Change-Id: I893e867c1dc539b708ca0d893af0ba958b473b45
---
M files/ssl/virt-star.eqiad.wmnet.crt
M modules/openstack/manifests/nova/compute.pp
2 files changed, 28 insertions(+), 20 deletions(-)

Approvals:
  Andrew Bogott: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/files/ssl/virt-star.eqiad.wmnet.crt 
b/files/ssl/virt-star.eqiad.wmnet.crt
index 2ac86cb..86695a3 100644
--- a/files/ssl/virt-star.eqiad.wmnet.crt
+++ b/files/ssl/virt-star.eqiad.wmnet.crt
@@ -1,21 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIDYTCCAkkCCQC+JtW2r4gdjDANBgkqhkiG9w0BAQUFADBwMQswCQYDVQQGEwJV
-UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEd
-MBsGA1UEChMUV2lraW1lZGlhIEZvdW5kYXRpb24xFTATBgNVBAMTDFdpa2ltZWRp
-YSBDQTAeFw0xMzAzMTkyMjI2MTFaFw0xODAzMTgyMjI2MTFaMHUxCzAJBgNVBAYT
-AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv
-MR0wGwYDVQQKExRXaWtpbWVkaWEgRm91bmRhdGlvbjEaMBgGA1UEAxQRdmlydCou
-ZXFpYWQud21uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKWKYg
-lg6Kgo6aGXKZkdhXAGfRh4CjbQKcBmvlgIQE7+mMjbWfy7f1pNM7GjtaClkzxrtW
-16rjbie2XNBtGoLW17WGhf1bpQlM9LWIkc/35/vCbijH0ue0DyjordqoTKxby3Ct
-gXton/zt3RFAngncLTjJ6jDVloVYWf8c2k2TMNvdRk50hLF82uI+EpdhnNTVaBlx
-cXVYjMEep2EPs9LbRF47FVvUncrf53Ulcwvo0cduH610NHqsQavgVPqjWQEHrqHz
-nINYKaI6iBGXgqRwRDIiQ15KPscJMNe59ORrqbLj9fGyZ6u/kUQsg4K1rMlT3Xdr
-0OwL+8xYlaWIsB49AgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAAHkhUnz+UD/lm2j
-O2XhX+4ELP4q8m7cDmkGhn21u1mdAKZFrNOpzeFbkAiOtBs7f1wAvyKgl37s7mPH
-3TC34VDXQeii/YzxFlfgBZ155yDY33tQOjjK3JKu65pOPQ1FFklfdoLh+oPg5Xav
-vHGtYWz7IgL2WPjH5y7rx1Z75Z98UhC2bbzsmvoXYJS9RMhY0bD6u232eVbJVGgF
-x4s12HhUaohso8OB8dBSERD9SZWSOApuThF/Xe1BGLbsqomkZia5m7vKIgegJUny
-ragnlGB0603v/CAo/ACIsq7U3W6FSoFqhJC6X5BDbjvEQkHqAO5Ebo1DgW56LSjv
-QBxOcaI=
+MIIE8jCCAtqgAwIBAgIBAzANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xHTAb
+BgNVBAoMFFdpa2ltZWRpYSBGb3VuZGF0aW9uMRMwEQYDVQQLDApPcGVyYXRpb25z
+MRkwFwYDVQQDDBBXTUYgQ0EgMjAxNC0yMDE3MB4XDTE1MDQxNzA4NTQxMVoXDTE3
+MDQwNjA4NTQxMVowcjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWEx
+HTAbBgNVBAoMFFdpa2ltZWRpYSBGb3VuZGF0aW9uMRMwEQYDVQQLDApPcGVyYXRp
+b25zMRowGAYDVQQDDBF2aXJ0Ki5lcWlhZC53bW5ldDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMpYpiCWDoqCjpoZcpmR2FcAZ9GHgKNtApwGa+WAhATv
+6YyNtZ/Lt/Wk0zsaO1oKWTPGu1bXquNuJ7Zc0G0agtbXtYaF/VulCUz0tYiRz/fn
++8JuKMfS57QPKOit2qhMrFvLcK2Be2if/O3dEUCeCdwtOMnqMNWWhVhZ/xzaTZMw
+291GTnSEsXza4j4Sl2Gc1NVoGXFxdViMwR6nYQ+z0ttEXjsVW9Sdyt/ndSVzC+jR
+x24frXQ0eqxBq+BU+qNZAQeuofOcg1gpojqIEZeCpHBEMiJDXko+xwkw17n05Gup
+suP18bJnq7+RRCyDgrWsyVPdd2vQ7Av7zFiVpYiwHj0CAwEAAaN7MHkwCQYDVR0T
+BAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNh
+dGUwHQYDVR0OBBYEFHyQUi3pZuiz/2TnEFn4j+oNP9AcMB8GA1UdIwQYMBaAFPQN
+VMurYCdiE4P7+Ck76MiYr4gpMA0GCSqGSIb3DQEBBQUAA4ICAQAIEQhvd9eOdYNV
+ou3exEfYA1k/dTBVHDpIn9tTry7OGflemOi+Xm8wpNGBmQkbCqVsyL1uvXFToGdd
+BPxUQ5BmeqQr7nc1rHANlGGYujdTIa7Q8ay7Xc8qRq6XCsdWgy9CpPcE6vBgf2pm
+QB4SHgwQiS1ofO1F6Xbvd5lXTiQo1wHafAN3PMSkXUZvj6+V4Ys3gEMzMAx0yFzc
+YnQN84UeB4mrYDTrxczaVwU0oXAixG2F1QLuYKMq/sPepCGkhwH5n24K939wDn1E
+3VIMkq7okTwwo+wgGFglMr1EAwkIOVcdXcAl7Vf/AAVJrjtg8cp1l5qTdJwe+1yv
+hhAIC7x8biMLpnKC4r8iaa2CyuoRbJvKEgQfEE6BIjbbZPRitIC1f4LIXDAK8tP6
+Og3u7juT2IzjTS91s0nHpm+3bw3ukHmoQqdZds+puFZrl09FPYQCrfDm8mffZsPb
+GTWUbXCZk2dLb6IANBCzlMV+7r1uFj5o1bwS5Ex8cKVT/t4GNKwtp1iI0El+7Kvs
+3daftDk249Da8xStZa6LG+E1g6Q00GioPnvuycMXIE0bvriujVmUNaT40oKI2C0R
+DOqfwwASF3To2QnoNS4hPzeb9n6rbxJfw5GXr+xA+9cxxrMxqX6VHLCOtS3VGj1E
+bOLCOgb+ryAwCmZpubchfY6OiT/zGg==
 -----END CERTIFICATE-----
diff --git a/modules/openstack/manifests/nova/compute.pp 
b/modules/openstack/manifests/nova/compute.pp
index 6aa9afb..debd362 100644
--- a/modules/openstack/manifests/nova/compute.pp
+++ b/modules/openstack/manifests/nova/compute.pp
@@ -10,7 +10,7 @@
             $ca_target = '/etc/ssl/certs/wmf_ca_2014_2017.pem'
         } else {
             $certname = "virt-star.${site}.wmnet"
-            $ca_target = '/etc/ssl/certs/wmf-ca.pem'
+            $ca_target = '/etc/ssl/certs/wmf_ca_2014_2017.pem'
         }
         install_certificate{ "${certname}": }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I893e867c1dc539b708ca0d893af0ba958b473b45
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to