projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test(dependencies): add hosts entries for testing
[arvados-formula.git]
/
test
/
salt
/
states
/
examples
/
single_host
/
host_entries.sls
diff --git
a/test/salt/states/examples/single_host/host_entries.sls
b/test/salt/states/examples/single_host/host_entries.sls
index 177ad184867e20c43ccac9cbc9acd73dae3552aa..fc35678a2805751c51b65d6aaef3a50df506411e 100644
(file)
--- a/
test/salt/states/examples/single_host/host_entries.sls
+++ b/
test/salt/states/examples/single_host/host_entries.sls
@@
-3,9
+3,6
@@
{%- from "arvados/map.jinja" import arvados with context %}
{%- set tpldir = curr_tpldir %}
{%- from "arvados/map.jinja" import arvados with context %}
{%- set tpldir = curr_tpldir %}
-include:
- - nginx.config
-
arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
host.present:
- ip: {{ grains.get('ipv4')[0] }}
arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
host.present:
- ip: {{ grains.get('ipv4')[0] }}
@@
-19,6
+16,7
@@
arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
'controller',
'download',
'keep',
'controller',
'download',
'keep',
+ 'keepweb',
'keep0',
'shell',
'workbench',
'keep0',
'shell',
'workbench',
@@
-26,8
+24,10
@@
arvados_test_salt_states_examples_single_host_etc_hosts_host_present:
'ws',
]
%}
'ws',
]
%}
+ - {{ entry }}
- {{ entry }}.internal
- {{ entry }}.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
{%- endfor %}
- require_in:
- file: nginx_config
- {{ entry }}.internal
- {{ entry }}.{{ arvados.cluster.name }}.{{ arvados.cluster.domain }}
{%- endfor %}
- require_in:
- file: nginx_config
+ - service: nginx_service