From 1a27fb8b3bbf6f9ee2bd0db47c443722b05f782a Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
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')
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