Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

add in openshift staging wildcard cert, keep prod pointing to fpo until we deploy there

Browse source
This commit is contained in:
Kevin Fenzi 2017-06-12 18:55:49 +00:00
parent be0788e7e0
commit ad0cd98a25
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inventory/group_vars/all
View file

@ -138,6 +138,12 @@ wildcard_crt_file: wildcard-2017.fedoraproject.org.cert
wildcard_key_file: wildcard-2017.fedoraproject.org.key
wildcard_int_file: wildcard-2017.fedoraproject.org.intermediate.cert
# This is the openshift wildcard cert. Until it exists set it equal to wildcard
os_wildcard_cert_name: wildcard-2017.fedoraproject.org
os_wildcard_crt_file: wildcard-2017.fedoraproject.org.cert
os_wildcard_key_file: wildcard-2017.fedoraproject.org.key
os_wildcard_int_file: wildcard-2017.fedoraproject.org.intermediate.cert
# Everywhere, always, we should sign messages and validate signatures.
# However, we allow individual hosts and groups to override this. Use this very
# carefully.. and never in production (good for testing stuff in staging).

5
inventory/group_vars/staging
View file

@ -10,6 +10,11 @@ wildcard_cert_file: wildcard-2017.stg.fedoraproject.org.cert
wildcard_key_file: wildcard-2017.stg.fedoraproject.org.key
wildcard_int_file: wildcard-2017.stg.fedoraproject.org.intermediate.cert
# This is the openshift wildcard cert for stg
os_wildcard_cert_name: wildcard-2017.app.os.stg.fedoraproject.org
os_wildcard_cert_file: wildcard-2017.app.os.stg.fedoraproject.org.cert
os_wildcard_key_file: wildcard-2017.app.os.stg.fedoraproject.org.key
os_wildcard_int_file: wildcard-2017.stg.fedoraproject.org.intermediate.cert
# This only does anything if the host is not RHEL6
collectd_graphite: True

3
playbooks/include/proxies-websites.yml
View file

@ -566,7 +566,8 @@
name: app.os.fedoraproject.org
server_aliases: ["*.app.os.fedoraproject.org", "*.app.os.stg.fedoraproject.org"]
sslonly: true
cert_name: "{{wildcard_cert_name}}"
cert_name: "{{os_wildcard_cert_name}}"
SSLCertificateChainFile: wildcard-2017.app.os.stg.fedoraproject.org.intermediate.cert
- role: httpd/website
name: registry.fedoraproject.org