test(dispatcher): add helper state

diff --git a/arvados/dispatcher/service/files/default/crunch-run-sh.tmpl b/arvados/dispatcher/service/files/default/crunch-run-sh.tmpl
index b0c1df9426ef017671f1f2a6ed64fe25cd3ab496..edfe44ed93b60059ec544afd258912b393f16455 100644 (file)
--- a/arvados/dispatcher/service/files/default/crunch-run-sh.tmpl
+++ b/arvados/dispatcher/service/files/default/crunch-run-sh.tmpl
@@ -1,6 +1,6 @@
--########################################################################
--# File managed by Salt at <{{ source }}>.
--# Your changes will be overwritten.
--########################################################################
--#!/bin/sh
--exec /usr/bin/crunch-run -container-enable-networking=default -container-network-mode=host ${@}
+#!/bin/sh
+########################################################################
+# File managed by Salt at <{{ source }}>.
+# Your changes will be overwritten.
+########################################################################
+exec /usr/bin/crunch-run -container-enable-networking=default -container-network-mode=host ${@}

diff --git a/test/salt/states/hosts_entries/init.sls b/test/salt/states/hosts_entries/init.sls
new file mode 100644 (file)
index 0000000..378571e
--- /dev/null
+++ b/test/salt/states/hosts_entries/init.sls
@@ -0,0 +1,20 @@
+arvados_hosts_entries:
+  host.present:
+    - ip: {{ grains.get('ipv4')[0] }}
+    - names:
+      - {{ grains.get('fqdn') }}
+      {%- for entry in [
+          'keep',
+          'keep0',
+          'collections',
+          'download',
+          'ws',
+          'workbench',
+          'workbench2'
+        ]
+      %}
+      - {{ entry }}
+      # FIXME! This just works for our testings.
+      # Won't work if the cluster name != host name
+      - {{ entry }}.{{ grains.get('host') }}.{{ grains.get('domain') }}
+      {%- endfor %}