diff --git a/inventory/group_vars/all b/inventory/group_vars/all index bb721f3a7f..f42d5e8fe6 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -190,10 +190,10 @@ ocp_wildcard_key_file: wildcard-2022.apps.ocp.fedoraproject.org.key # Fedora Infra openshift_ansible: /srv/web/infra/openshift-ansible/ # This is the openshift wildcard cert. Until it exists set it equal to wildcard -os_wildcard_cert_name: wildcard-2021.app.os.fedoraproject.org -os_wildcard_crt_file: wildcard-2021.app.os.fedoraproject.org.cert -os_wildcard_int_file: wildcard-2021.app.os.fedoraproject.org.intermediate.cert -os_wildcard_key_file: wildcard-2021.app.os.fedoraproject.org.key +os_wildcard_cert_name: wildcard-2022.app.os.fedoraproject.org +os_wildcard_crt_file: wildcard-2022.app.os.fedoraproject.org.cert +os_wildcard_int_file: wildcard-2022.app.os.fedoraproject.org.intermediate.cert +os_wildcard_key_file: wildcard-2022.app.os.fedoraproject.org.key postfix_group: "none" # This is a list of services that need to wait for VPN to be up before getting started. postvpnservices: [] diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging index c590e79bd8..8d0cbe9037 100644 --- a/inventory/group_vars/staging +++ b/inventory/group_vars/staging @@ -44,11 +44,11 @@ ocp_wildcard_cert_file: wildcard-2022.apps.ocp.stg.fedoraproject.org.cert ocp_wildcard_cert_name: wildcard-2022.apps.ocp.stg.fedoraproject.org ocp_wildcard_int_file: wildcard-2022.apps.ocp.stg.fedoraproject.org.intermediate.cert ocp_wildcard_key_file: wildcard-2022.apps.ocp.stg.fedoraproject.org.key -os_wildcard_cert_file: wildcard-2021.app.os.stg.fedoraproject.org.cert +os_wildcard_cert_file: wildcard-2022.app.os.stg.fedoraproject.org.cert # This is the openshift wildcard cert for stg -os_wildcard_cert_name: wildcard-2021.app.os.stg.fedoraproject.org -os_wildcard_int_file: wildcard-2021.app.os.stg.fedoraproject.org.intermediate.cert -os_wildcard_key_file: wildcard-2021.app.os.stg.fedoraproject.org.key +os_wildcard_cert_name: wildcard-2022.app.os.stg.fedoraproject.org +os_wildcard_int_file: wildcard-2022.app.os.stg.fedoraproject.org.intermediate.cert +os_wildcard_key_file: wildcard-2022.app.os.stg.fedoraproject.org.key # RIP, FAS primary_auth_source: ipa wildcard_cert_file: wildcard-2022.stg.fedoraproject.org.cert diff --git a/playbooks/include/proxies-certificates.yml b/playbooks/include/proxies-certificates.yml index 13d394f054..ad06f208dc 100644 --- a/playbooks/include/proxies-certificates.yml +++ b/playbooks/include/proxies-certificates.yml @@ -38,8 +38,8 @@ when: env == "staging" - role: httpd/certificate - certname: wildcard-2021.app.os.stg.fedoraproject.org - SSLCertificateChainFile: wildcard-2021.app.os.stg.fedoraproject.org.intermediate.cert + certname: wildcard-2022.app.os.stg.fedoraproject.org + SSLCertificateChainFile: wildcard-2022.app.os.stg.fedoraproject.org.intermediate.cert when: env == "staging" tags: - app.os.stg.fedoraproject.org @@ -52,8 +52,8 @@ - apps.ocp.stg.fedoraproject.org - role: httpd/certificate - certname: wildcard-2021.app.os.fedoraproject.org - SSLCertificateChainFile: wildcard-2021.app.os.fedoraproject.org.intermediate.cert + certname: wildcard-2022.app.os.fedoraproject.org + SSLCertificateChainFile: wildcard-2022.app.os.fedoraproject.org.intermediate.cert tags: - app.os.fedoraproject.org