summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Lundberg <lundberg@nordu.net>2015-03-31 10:53:34 +0200
committerJohan Lundberg <lundberg@nordu.net>2015-03-31 10:53:34 +0200
commite83523095a7f01d554becadf129bb4d35e1ad471 (patch)
treef5760bb6aefecda89163f42052cdcb04a52cb24f
parent84241ebd52192666d49d0e7fceedd850a00bd018 (diff)
Changed to sunet::dockerhost for kvm2sunet-ops-2015-03-31-v07
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp5
1 files changed, 2 insertions, 3 deletions
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'],