diff options
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 8bba4a4..588e935 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -102,13 +102,11 @@ 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': } + docker::image {'docker.sunet.se/datasets': } file {'/opt/lobo2-redis-data': ensure => 'directory', } - file {'/etc/shibboleth': + file {'/etc/ssl': ensure => 'directory', } docker::run {'redis': @@ -116,24 +114,12 @@ node 'datasets.sunet.se' { use_name => true, volumes => ['/opt/lobo2-redis-data:/data'], } - docker::run {'lobo2': + docker::run {'datasets': 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'], - env => ['SP_CONTACT=noc@sunet.se','SP_HOSTNAME=datasets.sunet.se'], - } - docker::run {'pound': - image => 'docker.sunet.se/pound', - links => ['shibsp:backend'], volumes => ['/etc/ssl:/etc/ssl'], - ports => ['443:443'] + links => ['redis:redis'], } } |