From 4b0c8962a2e80f9942d7006e7e58c26816da7da5 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sep 18 2023 17:26:48 +0000 Subject: Drop virt_cluster pillar Move ip_addrs mine function to common pillar, it is useful for all virtual machines. The "private_ip_address" mine does not seem to be used anywhere. Signed-off-by: Georg Pfuetzenreuter --- diff --git a/pillar/common/init.sls b/pillar/common/init.sls index 12cec49..ebd6d73 100644 --- a/pillar/common/init.sls +++ b/pillar/common/init.sls @@ -199,3 +199,6 @@ zypper: traceroute: {} {% endif %} refreshdb_force: false + +mine_functions: + network.ip_addrs: [] diff --git a/pillar/top.sls b/pillar/top.sls index bb53ef6..b283c91 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -19,11 +19,6 @@ - salt_cluster.{{ salt_cluster }} - salt_cluster.{{ salt_cluster }}.osfullname.{{ osfullname.replace(' ', '_') }} {% endif %} - {% if virt_cluster %} - 'virt_cluster:{{ virt_cluster }}': - - match: grain - - virt_cluster.{{ virt_cluster }} - {% endif %} '{{ id }}': - id.{{ id_subst }} {%- for role in roles %} diff --git a/pillar/virt_cluster/atreju.sls b/pillar/virt_cluster/atreju.sls deleted file mode 100644 index 0920815..0000000 --- a/pillar/virt_cluster/atreju.sls +++ /dev/null @@ -1,5 +0,0 @@ -mine_functions: - network.ip_addrs: [] - private_ip_address: - mine_function: network.ip_addrs - cidr: 192.168.47.0/24 diff --git a/pillar/virt_cluster/bryce.sls b/pillar/virt_cluster/bryce.sls deleted file mode 100644 index 2a1a602..0000000 --- a/pillar/virt_cluster/bryce.sls +++ /dev/null @@ -1,5 +0,0 @@ -mine_functions: - network.ip_addrs: [] - private_ip_address: - mine_function: network.ip_addrs - cidr: 192.168.67.0/24 diff --git a/pillar/virt_cluster/slimhat.sls b/pillar/virt_cluster/slimhat.sls deleted file mode 100644 index 259c035..0000000 --- a/pillar/virt_cluster/slimhat.sls +++ /dev/null @@ -1,3 +0,0 @@ -mine_functions: - network.ip_addrs: [] -