diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-09-23 15:19:17 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-09-23 15:19:17 +0200 |
| commit | f1c5d57f33a895ed20cca0c3105bb292f410ba74 (patch) | |
| tree | f0cd59402fa2fffc791540cc27eafb7bec2ab6c0 /global/overlay/etc | |
| parent | b0e4f70768f40f01f0718c108c8f2ef0683582fd (diff) | |
pull from sunetsunet-ops-2015-09-23-v18
Diffstat (limited to 'global/overlay/etc')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 3d71620..a8588a0 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -167,13 +167,13 @@ node 'docker.sunet.se' { define pyff($dir) { ensure_resource('class', 'sunet::dockerhost', {}) - sunet::docker_run {'pyff_${name}': + sunet::docker_run {"pyff_${name}": image => 'docker.sunet.se/pyff', imagetag => 'latest', volumes => ["${dir}:${dir}"], env => ['DATADIR=${dir}','LOGLEVEL=INFO'] } - sunet::docker_run {'varnish_${name}': + sunet::docker_run {"varnish_${name}": image => 'docker.sunet.se/varnish', imagetag => 'latest', env => ['BACKEND_PORT=tcp://pyff.varnish:80'], |