From a9df4bba6c9f85c789375297388e459b8d982e04 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:08:08 +0100 Subject: datasets --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 7676e61..ee9afb2 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -100,6 +100,39 @@ 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', + volumes => ['/opt/lobo2-redis-data:/data'], + } + docker::run {'lobo2': + image => 'docker.sunet.se/lobo2', + env => ['BASE_URL=https://datasets.sunet.se'], + links => ['redis:redis'], + } + docker::run {'shibsp': + image => 'docker.sunet.se/shibsp', + 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'], + ports => ['443:443'] + } +} + node 'docker.sunet.se' { docker::image {'registry': } docker::run {'registry': -- cgit v1.1 From 9eab59913bd6963b665f947df8b726c10a72e0b5 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:37:25 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 0a65f8d..a1abedd 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -136,10 +136,16 @@ node 'datasets.sunet.se' { node 'docker.sunet.se' { docker::image {'registry': } docker::run {'registry': + name => 'registry', image => 'registry', ports => ['80:5000'], volumes => ['/opt/registry:/tmp/registry'] } + docker::run {'pound': + image => 'leifj/pound', + links => ['registry:backend'], + ports => ['443:443'] + } } class docker_signer { -- cgit v1.1 From 2a43539d8c4eb0edcd5f3b050c7d6e5df465767f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:39:46 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index a1abedd..0f5ab79 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -135,6 +135,7 @@ node 'datasets.sunet.se' { node 'docker.sunet.se' { docker::image {'registry': } + docker::image {'leifj/pound': } docker::run {'registry': name => 'registry', image => 'registry', -- cgit v1.1 From 1a27fb8b3bbf6f9ee2bd0db47c443722b05f782a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:44:49 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 0f5ab79..c57d1f2 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -113,15 +113,18 @@ node 'datasets.sunet.se' { } 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'], @@ -137,10 +140,10 @@ node 'docker.sunet.se' { docker::image {'registry': } docker::image {'leifj/pound': } docker::run {'registry': - name => 'registry', - image => 'registry', - ports => ['80:5000'], - volumes => ['/opt/registry:/tmp/registry'] + use_name => true, + image => 'registry', + ports => ['80:5000'], + volumes => ['/opt/registry:/tmp/registry'] } docker::run {'pound': image => 'leifj/pound', -- cgit v1.1 From 491ea663136e78f9814d47ddc0aeee940e5b83c7 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:49:58 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index c57d1f2..e0be66b 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -139,7 +139,7 @@ node 'datasets.sunet.se' { node 'docker.sunet.se' { docker::image {'registry': } docker::image {'leifj/pound': } - docker::run {'registry': + docker::run {'sunetregistry': use_name => true, image => 'registry', ports => ['80:5000'], @@ -147,7 +147,7 @@ node 'docker.sunet.se' { } docker::run {'pound': image => 'leifj/pound', - links => ['registry:backend'], + links => ['sunetregistry:backend'], ports => ['443:443'] } } -- cgit v1.1 From 7852cb490e490acfa2ae87c8316a836d7c11b34c Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:52:22 +0100 Subject: pound it --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index e0be66b..b58faa3 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -148,6 +148,7 @@ node 'docker.sunet.se' { docker::run {'pound': image => 'leifj/pound', links => ['sunetregistry:backend'], + volymes => ['/etc/ssl:/etc/ssl'], ports => ['443:443'] } } -- cgit v1.1 From e50adc48200219d9c419c934c004241c73317830 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Wed, 5 Nov 2014 23:52:43 +0100 Subject: ferkrissakes --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index b58faa3..a38914a 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -148,7 +148,7 @@ node 'docker.sunet.se' { docker::run {'pound': image => 'leifj/pound', links => ['sunetregistry:backend'], - volymes => ['/etc/ssl:/etc/ssl'], + volumes => ['/etc/ssl:/etc/ssl'], ports => ['443:443'] } } -- cgit v1.1 From b6446e0e4218219ebe442cd2a8a71da892833265 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 6 Nov 2014 13:11:04 +0100 Subject: mount cert directory --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'global/overlay/etc/puppet/manifests/cosmos-site.pp') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index a38914a..8bf7ebd 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -132,6 +132,7 @@ node 'datasets.sunet.se' { docker::run {'pound': image => 'docker.sunet.se/pound', links => ['shibsp:backend'], + volumes => ['/etc/ssl:/etc/ssl'], ports => ['443:443'] } } -- cgit v1.1