From 2adfc5a305727fef8ab47dd968dfa355a44c094b Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 13 Oct 2017 14:45:10 +0000
Subject: [PATCH] Enable odcs prod nodes.

---
 inventory/inventory                        | 14 ++++----------
 playbooks/include/proxies-reverseproxy.yml |  1 -
 playbooks/include/proxies-websites.yml     |  1 -
 roles/haproxy/templates/haproxy.cfg        |  3 +--
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/inventory/inventory b/inventory/inventory
index c4f2f67304..8eac68277c 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -593,17 +593,13 @@ ns04.phx2.fedoraproject.org
 ns05.fedoraproject.org
 
 [odcs-frontend]
-# not prod yet, until patrick finishes his audit.
-# https://pagure.io/fedora-infrastructure/issue/6182
-#odcs-frontend01.phx2.fedoraproject.org
+odcs-frontend01.phx2.fedoraproject.org
 
 [odcs-frontend-stg]
 odcs-frontend01.stg.phx2.fedoraproject.org
 
 [odcs-backend]
-# not prod yet, until patrick finishes his audit.
-# https://pagure.io/fedora-infrastructure/issue/6182
-#odcs-backend01.phx2.fedoraproject.org
+odcs-backend01.phx2.fedoraproject.org
 
 [odcs-backend-stg]
 odcs-backend01.stg.phx2.fedoraproject.org
@@ -613,10 +609,8 @@ odcs-frontend-stg
 odcs-backend-stg
 
 [odcs:children]
-# not prod yet, until patrick finishes his audit.
-# https://pagure.io/fedora-infrastructure/issue/6182
-#odcs-frontend
-#odcs-backend
+odcs-frontend
+odcs-backend
 
 [openqa]
 openqa01.qa.fedoraproject.org
diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml
index af8b6cbf22..4f55e3bb6b 100644
--- a/playbooks/include/proxies-reverseproxy.yml
+++ b/playbooks/include/proxies-reverseproxy.yml
@@ -622,7 +622,6 @@
     proxyurl: http://localhost:10066
     tags:
     - odcs
-    when: env == "staging"
 
   - role: httpd/reverseproxy
     website: data-analysis.fedoraproject.org
diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml
index 76fac4e9dc..66f45e4f7a 100644
--- a/playbooks/include/proxies-websites.yml
+++ b/playbooks/include/proxies-websites.yml
@@ -791,7 +791,6 @@
     sslonly: true
     server_aliases: [odcs.stg.fedoraproject.org]
     cert_name: "{{wildcard_cert_name}}"
-    when: env == "staging"
 
 # fedorahosted is retired. We have the site here so we can redirect it.
 
diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg
index 0a14ad1afa..ce3115d5ec 100644
--- a/roles/haproxy/templates/haproxy.cfg
+++ b/roles/haproxy/templates/haproxy.cfg
@@ -649,7 +649,6 @@ backend os-nodes-backend
     option  httpchk GET /
     http-check expect status 503
 
-{% if env == "staging" %}
 frontend odcs-frontend
     bind 0.0.0.0:10066
     default_backend odcs-backend
@@ -658,7 +657,7 @@ backend odcs-backend
     balance hdr(appserver)
     server  odcs-frontend01 odcs-frontend01:80 check inter 20s rise 2 fall 3
     option  httpchk GET /api/1/composes/
-{% endif %}
+
 # Apache doesn't handle the initial connection here like the other proxy
 # entries.  This proxy also doesn't use the http mode like the others.
 # stunnel should be sitting on port 9939 (public) and redirecting