From ea803c6b2c8d5685c100fe9f30670d0e861cd5ad Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Tue, 12 Apr 2016 13:44:46 +0000
Subject: [PATCH] docker-registry listen on port 5000, edge proxies will handle
 the rest

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

diff --git a/playbooks/groups/docker-registry.yml b/playbooks/groups/docker-registry.yml
index c5e11a2436..2dc230c62a 100644
--- a/playbooks/groups/docker-registry.yml
+++ b/playbooks/groups/docker-registry.yml
@@ -62,31 +62,10 @@
           }
         },
         httpd: {
-          addr: "localhost:5000"
+          addr: "*:5000"
         },
         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,
@@ -108,29 +87,7 @@
           }
         },
         httpd: {
-          addr: "localhost:5000"
+          addr: "*:5000"
         },
         when: env == "production"
       }
-    - {
-      role: docker-distribution-proxy,
-        servername: registry.fedorproject.org,
-        ssl: {
-          destdir: "/etc/pki/docker-distribution/",
-          certfile_src: "{{private}}/files/docker-registry/docker-registry-internal.pem",
-          certfile_dest: "docker-registry-internal.pem",
-          keyfile_src: "{{private}}/files/docker-registry/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 == "production"
-      }
-
-