From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 17 Oct 2022 19:48:10 +0000 (-0400)
Subject: 19215: Fix state creating /var/lib/aravdos/keep
X-Git-Tag: 2.5.0~21^2~24
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9d862fee9a5a3e75b7abf1815390392128062cdc

19215: Fix state creating /var/lib/aravdos/keep

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/keep_volume.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/keep_volume.sls
similarity index 85%
rename from tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/keep_volume.sls
rename to tools/salt-install/config_examples/single_host/multiple_hostnames/states/keep_volume.sls
index 6f3d7730eb..bd6d9ae312 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/keep_volume.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/states/keep_volume.sls
@@ -10,4 +10,4 @@ var_lib_arvados_keep_dir:
     - mode: '0770'
     - makedirs: true
     - require_in:
-      - pkg: {{ arvados.keepstore.pkg.name }}
+      - pkg: keepstore
diff --git a/tools/salt-install/config_examples/single_host/single_hostname/pillars/keep_volume.sls b/tools/salt-install/config_examples/single_host/single_hostname/states/keep_volume.sls
similarity index 85%
rename from tools/salt-install/config_examples/single_host/single_hostname/pillars/keep_volume.sls
rename to tools/salt-install/config_examples/single_host/single_hostname/states/keep_volume.sls
index 6f3d7730eb..bd6d9ae312 100644
--- a/tools/salt-install/config_examples/single_host/single_hostname/pillars/keep_volume.sls
+++ b/tools/salt-install/config_examples/single_host/single_hostname/states/keep_volume.sls
@@ -10,4 +10,4 @@ var_lib_arvados_keep_dir:
     - mode: '0770'
     - makedirs: true
     - require_in:
-      - pkg: {{ arvados.keepstore.pkg.name }}
+      - pkg: keepstore