From 43f868cf02aa686838a89d16283b43fa0d431f52 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Thu, 7 Apr 2016 22:38:44 +0000
Subject: [PATCH] differentiate between prod and staging

Signed-off-by: Adam Miller <admiller@redhat.com>
---
 playbooks/groups/docker-registry.yml | 45 +++++++++++++++-------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index 8fc30d3d63..c5e11a2436 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -41,6 +41,7 @@
   #       on localhost and all external connections will be through httpd which
   #       will be SSL enalbed.
   roles:
+    # STAGING
     - {
       role: docker-distribution,
         conf_path: "/etc/docker-distribution/registry/config.yml",
@@ -65,6 +66,28 @@
         },
         when: env == "staging"
       }
+    - {
+      role: docker-distribution-proxy,
+        servername: registry.stg.fedorproject.org,
+        ssl: {
+          destdir: "/etc/pki/docker-distribution/",
+          certfile_src: "{{private}}/files/docker-registry/staging/docker-registry-internal.pem",
+          certfile_dest: "docker-registry-internal.pem",
+          keyfile_src: "{{private}}/files/docker-registry/staging/docker-registry-internal.key",
+          keyfile_dest: "docker-registry-internal.key",
+        },
+        auth: {
+          type: basic,
+          basic: {
+            destdir: "/etc/httpd/",
+            userfile_src: "{{private}}/files/httpd/osbs.htpasswd",
+            userfile_dest: "osbs.htpasswd",
+          }
+        },
+        when: env == "staging"
+      }
+
+    # PROD
     - {
       role: docker-distribution,
         conf_path: "/etc/docker-distribution/registry/config.yml",
@@ -89,26 +112,6 @@
         },
         when: env == "production"
       }
-    - {
-      role: docker-distribution-proxy,
-        servername: registry.stg.fedorproject.org,
-        ssl: {
-          destdir: "/etc/pki/docker-distribution/",
-          certfile_src: "{{private}}/files/docker-registry/staging/docker-registry-internal.pem",
-          certfile_dest: "docker-registry-internal.pem",
-          keyfile_src: "{{private}}/files/docker-registry/staging/docker-registry-internal.key",
-          keyfile_dest: "docker-registry-internal.key",
-        },
-        auth: {
-          type: basic,
-          basic: {
-            destdir: "/etc/httpd/",
-            userfile_src: "{{private}}/files/httpd/osbs.htpasswd",
-            userfile_dest: "osbs.htpasswd",
-          }
-        },
-        when: env == "staging"
-      }
     - {
       role: docker-distribution-proxy,
         servername: registry.fedorproject.org,
@@ -127,7 +130,7 @@
             userfile_dest: "osbs.htpasswd",
           }
         },
-        when: env == "staging"
+        when: env == "production"
       }