From 14944d96663a9946c554decc6da6f3fa57cad22e Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sun, 6 Apr 2025 16:21:32 +0200 Subject: [PATCH] feat(config): support emptying config The removal option is not suitable for systems where Salt is installed from distribution packages which place back a default configuration. Allow emptying the file instead of removing it, to benefit from removing any undesired, unmanaged, configuration changes in it, whilst not causing ping-pong between Salt and package updates. Signed-off-by: Georg Pfuetzenreuter --- pillar.example | 6 ++++++ salt/defaults.yaml | 2 ++ salt/master.sls | 6 ++++++ salt/minion.sls | 6 ++++++ test/integration/default/files/_mapdata/almalinux-8.yaml | 2 ++ test/integration/default/files/_mapdata/almalinux-9.yaml | 2 ++ test/integration/default/files/_mapdata/amazonlinux-2.yaml | 2 ++ .../default/files/_mapdata/amazonlinux-2023.yaml | 2 ++ .../default/files/_mapdata/arch-base-latest.yaml | 2 ++ test/integration/default/files/_mapdata/centos-7.yaml | 2 ++ test/integration/default/files/_mapdata/centos-8.yaml | 2 ++ test/integration/default/files/_mapdata/centos-9.yaml | 2 ++ test/integration/default/files/_mapdata/debian-10.yaml | 2 ++ test/integration/default/files/_mapdata/debian-11.yaml | 2 ++ test/integration/default/files/_mapdata/debian-12.yaml | 2 ++ test/integration/default/files/_mapdata/debian-9.yaml | 2 ++ test/integration/default/files/_mapdata/fedora-33.yaml | 2 ++ test/integration/default/files/_mapdata/fedora-34.yaml | 2 ++ test/integration/default/files/_mapdata/fedora-35.yaml | 2 ++ test/integration/default/files/_mapdata/fedora-36.yaml | 2 ++ test/integration/default/files/_mapdata/fedora-40.yaml | 2 ++ test/integration/default/files/_mapdata/fedora-41.yaml | 2 ++ test/integration/default/files/_mapdata/freebsd-12.yaml | 2 ++ test/integration/default/files/_mapdata/freebsd-13.yaml | 2 ++ test/integration/default/files/_mapdata/gentoo-2-sysd.yaml | 2 ++ test/integration/default/files/_mapdata/gentoo-2-sysv.yaml | 2 ++ test/integration/default/files/_mapdata/mac_os_x-10.yaml | 2 ++ test/integration/default/files/_mapdata/mac_os_x-11.yaml | 2 ++ test/integration/default/files/_mapdata/mac_os_x-12.yaml | 2 ++ test/integration/default/files/_mapdata/openbsd-6.yaml | 2 ++ test/integration/default/files/_mapdata/openbsd-7.yaml | 2 ++ test/integration/default/files/_mapdata/opensuse-15.yaml | 2 ++ .../default/files/_mapdata/opensuse-tumbleweed.yaml | 2 ++ test/integration/default/files/_mapdata/oraclelinux-7.yaml | 2 ++ test/integration/default/files/_mapdata/oraclelinux-8.yaml | 2 ++ test/integration/default/files/_mapdata/oraclelinux-9.yaml | 2 ++ test/integration/default/files/_mapdata/rockylinux-8.yaml | 2 ++ test/integration/default/files/_mapdata/rockylinux-9.yaml | 2 ++ test/integration/default/files/_mapdata/ubuntu-18.yaml | 2 ++ test/integration/default/files/_mapdata/ubuntu-20.yaml | 2 ++ test/integration/default/files/_mapdata/ubuntu-22.yaml | 2 ++ test/integration/default/files/_mapdata/ubuntu-24.yaml | 2 ++ test/integration/default/files/_mapdata/windows-10.yaml | 2 ++ .../default/files/_mapdata/windows-2016-server.yaml | 2 ++ .../default/files/_mapdata/windows-2019-server.yaml | 2 ++ .../default/files/_mapdata/windows-2022-server.yaml | 2 ++ test/integration/default/files/_mapdata/windows-8.yaml | 2 ++ 47 files changed, 106 insertions(+) diff --git a/pillar.example b/pillar.example index dd40882..aef11ed 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 2b84eec..69e241a 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 7ad272b..097da6b 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 3436244..a7100dc 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 8633ac5..445ceac 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 c27ba30..7915206 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 175f200..d73cc6f 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 d414720..7fc0c06 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 798f5ff..3044386 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 72ccc36..4ae8b5d 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 65a6b1e..5c6da78 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 acd292c..34608d2 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 e3d07ce..505fef3 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 4ec2914..2a99ba5 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 80e2549..4570450 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 9ed1616..287c554 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 4187c7e..eceecb6 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 bf86114..01a3f70 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 13c0f81..0e11b06 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 b006dde..343f559 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 b006dde..343f559 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 6cbf60e..53d25db 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 c6aa88a..f0c50ee 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 ec8d795..bec69c7 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 008272c..ed02e58 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 008272c..ed02e58 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 b8f0fa7..15be5f4 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 b8f0fa7..15be5f4 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 b8f0fa7..15be5f4 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 56605f5..f27465f 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 4d71f3b..b47b8e7 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 bf09fc6..7685455 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 f0b0ca2..1718bad 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 6ae2694..227d3d4 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 4ab6757..46a2fe8 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 426bf70..3d10e5e 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 f4e129e..8781428 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 73e947d..942cf59 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 1bd6744..4586229 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 8f0e84e..82ff92c 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 efcbaff..c19dc60 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 7dcb575..282edee 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 82b75c6..d379bc2 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 87d32e6..421babc 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 2f71007..7c3a2ab 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 4457677..00c759e 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 65342e9..d4159d4 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: