use sunet macrosunet-ops-2015-09-15-v01

1 files changed, 4 insertions, 10 deletions

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 7699f33..8ce667e 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -115,29 +115,23 @@ node 'reep.tid.isoc.org' {
 }
 
 node 'datasets.sunet.se' {
-   docker::image {'dockerfile/redis': }
-   docker::image {'docker.sunet.se/datasets': }
    file {'/opt/lobo2-redis-data':
       ensure => 'directory',
    }
    file {'/etc/ssl':
       ensure => 'directory',
    }
-   docker::run {'redis':
+   sunet::docker_run {'redis':
       image    => 'dockerfile/redis',
-      use_name => true,
       volumes  => ['/opt/lobo2-redis-data:/data','/var/log:/var/log'],
-      verify_checksum => false,
-   }
-   docker::run {'datasets':
+   } ->
+   sunet::docker_run {'datasets':
       image    => 'docker.sunet.se/datasets',
-      use_name => true,
       env      => ['BASE_URL=https://datasets.sunet.se'],
       volumes  => ['/etc/ssl:/etc/ssl','/var/log:/var/log'],
       ports    => ['80:80','443:443'],
-      links    => ['redis:redis'],
+      env      => ["REDIS_PORT=tcp://redis.docker:6379"],
       start_on => 'docker-redis',
-      verify_checksum => false,
    }
 }