diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 178dac8bf..61ed616f4 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -713,7 +713,9 @@ post_to_2.4.210() { /usr/sbin/so-yaml.py remove /opt/so/saltstack/local/pillar/elasticsearch/soc_elasticsearch.sls elasticsearch.managed_integrations fi - + # Remove so-rule-update script left behind by the idstools removal in 2.4.200 + rm -f /usr/sbin/so-rule-update + POSTVERSION=2.4.210 } @@ -1004,8 +1006,6 @@ up_to_2.4.210() { # This state is used to deal with the breaking change introduced in 3006.17 - https://docs.saltproject.io/en/3006/topics/releases/3006.17.html # This is the only way the state is called so we can use concurrent=True salt-call state.apply salt.master.add_minimum_auth_version --file-root=$UPDATE_DIR/salt --local concurrent=True - # Remove so-rule-update script left behind by the idstools removal in 2.4.200 - rm -f /usr/sbin/so-rule-update INSTALLEDVERSION=2.4.210 }