diff --git a/pillar.example b/pillar.example index dd408823..aef11ed0 100644 --- a/pillar.example +++ b/pillar.example @@ -10,9 +10,15 @@ salt: # This state will remove "/etc/salt/minion" when you set this to true. minion_remove_config: true + # /etc/salt/minion will be emptied if you set this to true. + minion_empty_config: true + # This state will remove "/etc/salt/master" when you set this to true. master_remove_config: true + # /etc/salt/master will be emptied if you set this to true. + master_empty_config: true + # Set this to 'py3' to install the Python 3 packages. # The default varies between OS versions. py_ver: 'py3' diff --git a/salt/defaults.yaml b/salt/defaults.yaml index 2b84eec3..69e241a1 100644 --- a/salt/defaults.yaml +++ b/salt/defaults.yaml @@ -15,7 +15,9 @@ salt: config_path: /etc/salt + minion_empty_config: false minion_remove_config: false + master_empty_config: false master_remove_config: false minion_config_use_TOFS: false master_config_use_TOFS: false diff --git a/salt/master.sls b/salt/master.sls index 7ad272bc..097da6b8 100644 --- a/salt/master.sls +++ b/salt/master.sls @@ -72,6 +72,12 @@ remove-default-master-conf-file: - name: {{ salt_settings.config_path }}/master - watch_in: - service: salt-master + {% elif salt_settings.master_empty_config %} +empty-default-master-conf-file: + file.managed: + - name: {{ salt_settings.config_path }}/master + - contents: | + # Configuration is managed by Salt {% endif %} # clean up old _defaults.conf file if they have it around diff --git a/salt/minion.sls b/salt/minion.sls index 34362449..a7100dcd 100644 --- a/salt/minion.sls +++ b/salt/minion.sls @@ -181,6 +181,12 @@ salt-minion-beacon-inotify: remove-default-minion-conf-file: file.absent: - name: {{ salt_settings.config_path }}/minion + {% elif salt_settings.minion_empty_config %} +empty-default-minion-conf-file: + file.managed: + - name: {{ salt_settings.config_path }}/master + - contents: | + # Configuration is managed by Salt {% endif %} # clean up old _defaults.conf file if they have it around diff --git a/test/integration/default/files/_mapdata/almalinux-8.yaml b/test/integration/default/files/_mapdata/almalinux-8.yaml index 8633ac51..445ceacf 100644 --- a/test/integration/default/files/_mapdata/almalinux-8.yaml +++ b/test/integration/default/files/_mapdata/almalinux-8.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/almalinux-9.yaml b/test/integration/default/files/_mapdata/almalinux-9.yaml index c27ba307..79152068 100644 --- a/test/integration/default/files/_mapdata/almalinux-9.yaml +++ b/test/integration/default/files/_mapdata/almalinux-9.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 175f2008..d73cc6f2 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/amazonlinux-2023.yaml b/test/integration/default/files/_mapdata/amazonlinux-2023.yaml index d414720e..7fc0c063 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2023.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2023.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 798f5ffd..3044386f 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 72ccc36d..4ae8b5d5 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 65a6b1eb..5c6da78f 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/centos-9.yaml b/test/integration/default/files/_mapdata/centos-9.yaml index acd292c3..34608d2c 100644 --- a/test/integration/default/files/_mapdata/centos-9.yaml +++ b/test/integration/default/files/_mapdata/centos-9.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index e3d07ce2..505fef3e 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/debian-11.yaml b/test/integration/default/files/_mapdata/debian-11.yaml index 4ec2914e..2a99ba56 100644 --- a/test/integration/default/files/_mapdata/debian-11.yaml +++ b/test/integration/default/files/_mapdata/debian-11.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/debian-12.yaml b/test/integration/default/files/_mapdata/debian-12.yaml index 80e2549a..4570450f 100644 --- a/test/integration/default/files/_mapdata/debian-12.yaml +++ b/test/integration/default/files/_mapdata/debian-12.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index 9ed16160..287c554f 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 4187c7e0..eceecb69 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/fedora-34.yaml b/test/integration/default/files/_mapdata/fedora-34.yaml index bf86114e..01a3f704 100644 --- a/test/integration/default/files/_mapdata/fedora-34.yaml +++ b/test/integration/default/files/_mapdata/fedora-34.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/fedora-35.yaml b/test/integration/default/files/_mapdata/fedora-35.yaml index 13c0f812..0e11b06a 100644 --- a/test/integration/default/files/_mapdata/fedora-35.yaml +++ b/test/integration/default/files/_mapdata/fedora-35.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/fedora-36.yaml b/test/integration/default/files/_mapdata/fedora-36.yaml index b006dde5..343f5598 100644 --- a/test/integration/default/files/_mapdata/fedora-36.yaml +++ b/test/integration/default/files/_mapdata/fedora-36.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/fedora-40.yaml b/test/integration/default/files/_mapdata/fedora-40.yaml index b006dde5..343f5598 100644 --- a/test/integration/default/files/_mapdata/fedora-40.yaml +++ b/test/integration/default/files/_mapdata/fedora-40.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/fedora-41.yaml b/test/integration/default/files/_mapdata/fedora-41.yaml index 6cbf60eb..53d25dbd 100644 --- a/test/integration/default/files/_mapdata/fedora-41.yaml +++ b/test/integration/default/files/_mapdata/fedora-41.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/freebsd-12.yaml b/test/integration/default/files/_mapdata/freebsd-12.yaml index c6aa88aa..f0c50eea 100644 --- a/test/integration/default/files/_mapdata/freebsd-12.yaml +++ b/test/integration/default/files/_mapdata/freebsd-12.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt_master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt_minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/freebsd-13.yaml b/test/integration/default/files/_mapdata/freebsd-13.yaml index ec8d7956..bec69c7c 100644 --- a/test/integration/default/files/_mapdata/freebsd-13.yaml +++ b/test/integration/default/files/_mapdata/freebsd-13.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt_master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt_minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 008272c9..ed02e586 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 008272c9..ed02e586 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/mac_os_x-10.yaml b/test/integration/default/files/_mapdata/mac_os_x-10.yaml index b8f0fa7c..15be5f47 100644 --- a/test/integration/default/files/_mapdata/mac_os_x-10.yaml +++ b/test/integration/default/files/_mapdata/mac_os_x-10.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: com.saltstack.salt.master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: com.saltstack.salt.minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/mac_os_x-11.yaml b/test/integration/default/files/_mapdata/mac_os_x-11.yaml index b8f0fa7c..15be5f47 100644 --- a/test/integration/default/files/_mapdata/mac_os_x-11.yaml +++ b/test/integration/default/files/_mapdata/mac_os_x-11.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: com.saltstack.salt.master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: com.saltstack.salt.minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/mac_os_x-12.yaml b/test/integration/default/files/_mapdata/mac_os_x-12.yaml index b8f0fa7c..15be5f47 100644 --- a/test/integration/default/files/_mapdata/mac_os_x-12.yaml +++ b/test/integration/default/files/_mapdata/mac_os_x-12.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: com.saltstack.salt.master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: com.saltstack.salt.minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/openbsd-6.yaml b/test/integration/default/files/_mapdata/openbsd-6.yaml index 56605f52..f27465fe 100644 --- a/test/integration/default/files/_mapdata/openbsd-6.yaml +++ b/test/integration/default/files/_mapdata/openbsd-6.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt_master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt_minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/openbsd-7.yaml b/test/integration/default/files/_mapdata/openbsd-7.yaml index 4d71f3bf..b47b8e70 100644 --- a/test/integration/default/files/_mapdata/openbsd-7.yaml +++ b/test/integration/default/files/_mapdata/openbsd-7.yaml @@ -62,6 +62,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt_master master_service_details: @@ -79,6 +80,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt_minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index bf09fc6c..7685455e 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index f0b0ca23..1718bad0 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index 6ae26944..227d3d43 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index 4ab6757e..46a2fe8a 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/oraclelinux-9.yaml b/test/integration/default/files/_mapdata/oraclelinux-9.yaml index 426bf709..3d10e5ec 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-9.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-9.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/rockylinux-8.yaml b/test/integration/default/files/_mapdata/rockylinux-8.yaml index f4e129e0..87814280 100644 --- a/test/integration/default/files/_mapdata/rockylinux-8.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/rockylinux-9.yaml b/test/integration/default/files/_mapdata/rockylinux-9.yaml index 73e947d8..942cf59c 100644 --- a/test/integration/default/files/_mapdata/rockylinux-9.yaml +++ b/test/integration/default/files/_mapdata/rockylinux-9.yaml @@ -63,6 +63,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -80,6 +81,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 1bd67441..45862298 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -64,6 +64,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -81,6 +82,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index 8f0e84e2..82ff92c4 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -64,6 +64,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -81,6 +82,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/ubuntu-22.yaml b/test/integration/default/files/_mapdata/ubuntu-22.yaml index efcbaffb..c19dc60b 100644 --- a/test/integration/default/files/_mapdata/ubuntu-22.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml @@ -64,6 +64,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -81,6 +82,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/ubuntu-24.yaml b/test/integration/default/files/_mapdata/ubuntu-24.yaml index 7dcb575a..282edee1 100644 --- a/test/integration/default/files/_mapdata/ubuntu-24.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-24.yaml @@ -64,6 +64,7 @@ values: base: - /srv/pillar master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -81,6 +82,7 @@ values: base: - /srv/pillar minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/windows-10.yaml b/test/integration/default/files/_mapdata/windows-10.yaml index 82b75c64..d379bc28 100644 --- a/test/integration/default/files/_mapdata/windows-10.yaml +++ b/test/integration/default/files/_mapdata/windows-10.yaml @@ -62,6 +62,7 @@ values: base: - "/srv/pillar" master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - "/srv/pillar" minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/windows-2016-server.yaml b/test/integration/default/files/_mapdata/windows-2016-server.yaml index 87d32e60..421babc7 100644 --- a/test/integration/default/files/_mapdata/windows-2016-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2016-server.yaml @@ -62,6 +62,7 @@ values: base: - "/srv/pillar" master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - "/srv/pillar" minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/windows-2019-server.yaml b/test/integration/default/files/_mapdata/windows-2019-server.yaml index 2f710071..7c3a2abe 100644 --- a/test/integration/default/files/_mapdata/windows-2019-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2019-server.yaml @@ -62,6 +62,7 @@ values: base: - "/srv/pillar" master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - "/srv/pillar" minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/windows-2022-server.yaml b/test/integration/default/files/_mapdata/windows-2022-server.yaml index 44576773..00c759e9 100644 --- a/test/integration/default/files/_mapdata/windows-2022-server.yaml +++ b/test/integration/default/files/_mapdata/windows-2022-server.yaml @@ -62,6 +62,7 @@ values: base: - "/srv/pillar" master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - "/srv/pillar" minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: diff --git a/test/integration/default/files/_mapdata/windows-8.yaml b/test/integration/default/files/_mapdata/windows-8.yaml index 65342e95..d4159d41 100644 --- a/test/integration/default/files/_mapdata/windows-8.yaml +++ b/test/integration/default/files/_mapdata/windows-8.yaml @@ -62,6 +62,7 @@ values: base: - "/srv/pillar" master_config_use_TOFS: false + master_empty_config: false master_remove_config: false master_service: salt-master master_service_details: @@ -79,6 +80,7 @@ values: base: - "/srv/pillar" minion_config_use_TOFS: false + minion_empty_config: false minion_remove_config: false minion_service: salt-minion minion_service_details: