summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-05-04 18:23:50 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-05-04 18:23:50 +0200
commite866c9810faef4300d6ab4643a1bac0a19e5c7ab (patch)
tree668d64f33595fd77d2b46ec3ee9d4ed6c8d59129
parent7d4131a9d17337a012ae6ea2f479b12c42ae7e91 (diff)
Added config for registry-auth and removed config for puppetsunet-ops-2015-05-05-v01
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp13
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']
}
}