From e83523095a7f01d554becadf129bb4d35e1ad471 Mon Sep 17 00:00:00 2001 From: Johan Lundberg Date: Tue, 31 Mar 2015 10:53:34 +0200 Subject: Changed to sunet::dockerhost for kvm2 --- global/overlay/etc/puppet/manifests/cosmos-site.pp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'global') diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 942ac77..2c2eb32 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -704,16 +704,15 @@ node 'sto-tug-kvm2.swamid.se' { file {'/var/log/flog_db': ensure => 'directory', } -> - class { 'sunet::dockerhost': } -> sunet::docker_run {'flog_db': image => 'docker.sunet.se/flog/postgresql-9.3', volumes => ['/opt/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'], } -> - docker::run {'flog_app': + sunet::docker_run {'flog_app': image => 'docker.sunet.se/flog/flog_app', volumes => ['/opt/flog/dotenv:/opt/flog/.env','/var/log/flog/:/opt/flog/logs/'], } -> - docker::run {'flog_nginx': + sunet::docker_run {'flog_nginx': image => 'docker.sunet.se/flog/nginx', ports => ['80:80', '443:443'], volumes => ['/opt/flog/nginx/sites-enabled/:/etc/nginx/sites-enabled/','/opt/flog/nginx/certs/:/etc/nginx/certs', '/var/log/flog_nginx/:/var/log/nginx'], -- cgit v1.1