summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2016-04-05 17:18:31 +0000
committerPatrick Uiterwijk <puiterwijk@redhat.com>2016-04-05 17:18:31 +0000
commitf33d6eda0ed0e1efda85c692b95e63f83cd5933a (patch)
treec4710fc7729b570b9d10ae1f29639f7581d9d3b9
parent6afb9e9f5a6d423fe126b431d1fa6f3ebd74a9ef (diff)
downloadansible-f33d6eda0ed0e1efda85c692b95e63f83cd5933a.tar.gz
ansible-f33d6eda0ed0e1efda85c692b95e63f83cd5933a.tar.xz
ansible-f33d6eda0ed0e1efda85c692b95e63f83cd5933a.zip
Add osbs and registry for staging
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
-rw-r--r--playbooks/include/proxies-reverseproxy.yml12
-rw-r--r--playbooks/include/proxies-websites.yml14
2 files changed, 26 insertions, 0 deletions
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index 917919713..d7ff03d28 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -483,3 +483,15 @@
destname: git
proxyurl: http://pkgs01.stg.phx2.fedoraproject.org
when: env == "staging"
+
+ - role: httpd/reverseproxy
+ website: osbs.fedoraproject.org
+ destname: osbs
+ proxyurl: http://localhost:10047
+ when: env == "staging"
+
+ - role: httpd/reverseproxy
+ website: registry.fedoraproject.org
+ destname: registry
+ proxyurl: http://localhost:10048
+ when: env == "staging"
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 814c219c6..74af02404 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -480,6 +480,20 @@
sslonly: true
cert_name: "{{wildcard_cert_name}}"
+ - role: httpd/website
+ name: osbs.fedoraproject.org
+ server-aliases: [osbs.stg.fedoraproject.org]
+ sslonly: true
+ cert_name: "{{wildcard_cert_name}}"
+ when: env == "staging"
+
+ - role: httpd/website
+ name: registry.fedoraproject.org
+ server-aliases: [registry.stg.fedoraproject.org]
+ sslonly: true
+ cert_name: "{{wildcard_cert_name}}"
+ when: env == "staging"
+
# Kinda silly that we have two entries here, one for prod and one for stg.
# This is inherited from our puppet setup -- we can collapse them as soon as
# is convenient. -- threebean