Merge branch 'master' of git.nordu.net:sunet-ops

1 files changed, 49 insertions, 4 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 5d8af22..f3961c5 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -100,12 +100,57 @@ node 'reep.tid.isoc.org' {
    
 }
 
+node 'datasets.sunet.se' {
+   docker::image {'dockerfile/redis': }
+   docker::image {'docker.sunet.se/lobo2': }
+   docker::image {'docker.sunet.se/shibsp': }
+   docker::image {'docker.sunet.se/pound': }
+   file {'/opt/lobo2-redis-data':
+      ensure => 'directory',
+   }
+   file {'/etc/shibboleth/credentials':
+      ensure => 'directory',
+   }
+   docker::run {'redis':
+      image    => 'dockerfile/redis',
+      use_name => true,
+      volumes  => ['/opt/lobo2-redis-data:/data'],
+   }
+   docker::run {'lobo2':
+      image    => 'docker.sunet.se/lobo2',
+      use_name => true,
+      env      => ['BASE_URL=https://datasets.sunet.se'],
+      links    => ['redis:redis'],
+   }
+   docker::run {'shibsp':
+      image    => 'docker.sunet.se/shibsp',
+      use_name => true,
+      links    => ['lobo2:backend'],
+      volumes  => ['/etc/shibboleth/credentials:/etc/shibboleth/credentials'],
+      env      => ['SP_CONTACT=noc@sunet.se','SP_HOSTNAME=datasets.sunet.se','SP_KEYDIR=/etc/shibboleth/credentials'],
+   }
+   docker::run {'pound':
+      image    => 'docker.sunet.se/pound',
+      links    => ['shibsp:backend'],
+      volumes  => ['/etc/ssl:/etc/ssl'],
+      ports    => ['443:443']
+   }
+}
+
 node 'docker.sunet.se' {
    docker::image {'registry': }
-   docker::run {'registry':
-      image   => 'registry',
-      ports   => ['80:5000'],
-      volumes => ['/opt/registry:/tmp/registry']
+   docker::image {'leifj/pound': }
+   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']
    }
 }