diff --git a/base/hostconfig/init.sls b/base/hostconfig/init.sls new file mode 100644 index 0000000..fa90c3c --- /dev/null +++ b/base/hostconfig/init.sls @@ -0,0 +1,5 @@ + +{% if salt['file.file_exists']({0}.sls'.format(grains.nodename)) %} +include: + - .{{ grains.nodename }} +{% endif %} diff --git a/base/hostconfig/wohnz.sls b/base/hostconfig/wohnz.sls new file mode 100644 index 0000000..42df9d3 --- /dev/null +++ b/base/hostconfig/wohnz.sls @@ -0,0 +1 @@ +has_fan: True diff --git a/base/init.sls b/base/init.sls index dd0e0e2..014f3f1 100644 --- a/base/init.sls +++ b/base/init.sls @@ -2,6 +2,6 @@ # vim: ft=yaml --- -#include: -# - .log.rsyslog.client -# - .sys.sysctl +include: + - .sys.sysctl + - .hostconfig diff --git a/top.sls b/top.sls index 369e98c..5ae582e 100644 --- a/top.sls +++ b/top.sls @@ -4,9 +4,9 @@ base: '*': + - base - saltmine - prometheus.node_exporter - - base.sys.sysctl - ceph 'riot01*': - haproxy