Trying to use dns instead of linksunet-ops-2015-03-31-v04

1 files changed, 6 insertions, 9 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index b4ea64d..11e8287 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -697,16 +697,15 @@ node 'cdr1.sunet.se' {
 }
 
 node 'sto-tug-kvm2.swamid.se' {
-   docker::image {'docker.sunet.se/flog/postgresql-9.3': }
-   docker::image {'docker.sunet.se/flog/nginx': }
-   docker::image {'docker.sunet.se/flog/flog_app': }
+    #class { 'fail2ban': }
    file {'/opt/docker/postgresql_data':
-      ensure => 'directory',
-   }
+       ensure => 'directory',
+   } ->
    file {'/var/log/flog_db':
       ensure => 'directory',
-   }
-   docker::run {'flog_db':
+   } ->
+   class { 'sunet::dockerhost': } ->
+   sunet::docker_run {'flog_db':
       image    => 'docker.sunet.se/flog/postgresql-9.3',
       use_name => true,
       volumes  => ['/opt/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'],
@@ -714,14 +713,12 @@ node 'sto-tug-kvm2.swamid.se' {
    docker::run {'flog_app':
       image    => 'docker.sunet.se/flog/flog_app',
       use_name => true,
-      links    => ['flog_db:flog_db'],
       volumes  => ['/opt/flog/dotenv:/opt/flog/.env','/var/log/flog/:/opt/flog/logs/'],
    } ->
    docker::run {'flog_nginx':
       image    => 'docker.sunet.se/flog/nginx',
       use_name => true,
       ports    => ['80:80', '443:443'],
-      links    => ['flog_app:flog_app'],
       volumes  => ['/opt/flog/nginx/sites-enabled/:/etc/nginx/sites-enabled/','/opt/flog/nginx/certs/:/etc/nginx/certs', '/var/log/flog_nginx/:/var/log/nginx'],
    }
 }