Added config for registry-auth and removed config for puppetsunet-ops-2015-05-05-v01

1 files changed, 7 insertions, 6 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 1780564..082fbe0 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -130,18 +130,19 @@ node 'datasets.sunet.se' {
 node 'docker.sunet.se' {
    class { 'sunet::nagios': }
    docker::image {'registry': }
-   docker::image {'leifj/pound': }
+   docker::image {'docker.sunet.se/registry-auth': }
    docker::run {'sunetregistry':
       use_name => true,
       image    => 'registry',
       ports    => ['80:5000'],
       volumes  => ['/opt/registry:/tmp/registry']
    }
-   docker::run {'pound':
-      image    => 'leifj/pound',
-      links    => ['sunetregistry:backend'],
-      volumes  => ['/etc/ssl:/etc/ssl'],
-      ports    => ['443:443']
+   docker::run {'registry-auth':
+      image   => 'docker.sunet.se/registry-auth',
+      links   => ['registry:backend'],
+      volumes => ['/etc/ssl:/etc/ssl'],
+      ports   => ['443:443'],
+      env     => ['PUBLIC_HOSTNAME=docker.sunet.se']
    }
 }