summaryrefslogtreecommitdiffstats
path: root/salt/profile
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-01-29 23:31:46 +0100
committerGeorg Pfuetzenreuter2023-01-29 23:33:40 +0100
commit81a37bf842f7b4285094cf7fa9c1eaeddf9ed652 (patch)
tree659155b838cdbad77c31a5c11238a20a7bbbe8ed /salt/profile
parentd2bc7b0785a09b1700ee10abb7f6b63fd18c75a8 (diff)
downloadsalt-81a37bf842f7b4285094cf7fa9c1eaeddf9ed652.tar.gz
salt-81a37bf842f7b4285094cf7fa9c1eaeddf9ed652.tar.bz2
salt-81a37bf842f7b4285094cf7fa9c1eaeddf9ed652.zip
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>
Diffstat (limited to 'salt/profile')
-rw-r--r--salt/profile/salt/files/etc/salt/grains.j29
-rw-r--r--salt/profile/salt/grains.sls12
-rw-r--r--salt/profile/salt/minion.sls1
3 files changed, 0 insertions, 22 deletions
diff --git a/salt/profile/salt/files/etc/salt/grains.j2 b/salt/profile/salt/files/etc/salt/grains.j2
deleted file mode 100644
index 74f3262..0000000
--- a/salt/profile/salt/files/etc/salt/grains.j2
+++ /dev/null
@@ -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 %}
diff --git a/salt/profile/salt/grains.sls b/salt/profile/salt/grains.sls
deleted file mode 100644
index 632a8bc..0000000
--- a/salt/profile/salt/grains.sls
+++ /dev/null
@@ -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
diff --git a/salt/profile/salt/minion.sls b/salt/profile/salt/minion.sls
index 12bef1d..5d33845 100644
--- a/salt/profile/salt/minion.sls
+++ b/salt/profile/salt/minion.sls
@@ -18,5 +18,4 @@
- service: salt-minion
include:
- - .grains
- salt.minion