salt.minion: no longer manage grains
Grains have only been managed to track roles, however those have since been moved to the Role API. Hence the managed /etc/salt/grains file can safely be removed from management. Existing installations will be cleaned up by me. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
d2bc7b0785
commit
81a37bf842
@ -1,9 +0,0 @@
|
|||||||
{%- set header = salt['pillar.get']('managed_header_pound') -%}
|
|
||||||
{%- set roles = salt['pillar.get']('netbox:config_context:roles', []) -%}
|
|
||||||
{{ header }}
|
|
||||||
{%- if roles is defined and roles %}
|
|
||||||
roles:
|
|
||||||
{%- for role in roles %}
|
|
||||||
- {{ role }}
|
|
||||||
{%- endfor %}
|
|
||||||
{% endif %}
|
|
@ -1,12 +0,0 @@
|
|||||||
salt_grains_file:
|
|
||||||
file.managed:
|
|
||||||
- user: root
|
|
||||||
- mode: '0644'
|
|
||||||
- template: jinja
|
|
||||||
- names:
|
|
||||||
- /etc/salt/grains:
|
|
||||||
- source: salt:///{{ slspath }}/files/etc/salt/grains.j2
|
|
||||||
- require_in:
|
|
||||||
- service: salt-minion
|
|
||||||
- watch_in:
|
|
||||||
- service: salt-minion
|
|
@ -18,5 +18,4 @@
|
|||||||
- service: salt-minion
|
- service: salt-minion
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- .grains
|
|
||||||
- salt.minion
|
- salt.minion
|
||||||
|
Loading…
Reference in New Issue
Block a user