diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-05-22 21:01:48 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-05-22 21:01:48 +0200 |
| commit | 635a62002768849b86b797544d4030001d8a1bbc (patch) | |
| tree | 0a48677ab1e01c8e2f2d913252cb91c2c8460e65 /global/overlay/etc/puppet/manifests/catlfish/merge.pp | |
| parent | 2b788f9f8d87ff36e347dc80db939d08db113493 (diff) | |
storagect-ops-2015-05-22-v02
Diffstat (limited to 'global/overlay/etc/puppet/manifests/catlfish/merge.pp')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/catlfish/merge.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/global/overlay/etc/puppet/manifests/catlfish/merge.pp b/global/overlay/etc/puppet/manifests/catlfish/merge.pp index f466be2..5be25a3 100644 --- a/global/overlay/etc/puppet/manifests/catlfish/merge.pp +++ b/global/overlay/etc/puppet/manifests/catlfish/merge.pp @@ -6,10 +6,10 @@ define catlfish::merge( $base = '/var/local/db/urd.appendto.org' file {$base: ensure => directory } -> file {"${base}/${name}": ensure => directory } -> - sunet::docker_run {'${name}_frontend': + sunet::docker_run {'${name}_merge': image => $image, env => ["MERGE_EXTRA_ARGS=--timing"], - imagetag => $version + imagetag => $version, volumes => ["/data/${name}/catlfish:/usr/local/etc/catlfish:ro","${base}/${name}:/var/local/db/catlfish"], command => ["merge /var/local/db/catlfish"] } |