diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls new file mode 100644 index 000000000..402ad9c4a --- /dev/null +++ b/salt/common/soup_scripts.sls @@ -0,0 +1,24 @@ +remove_common_soup: + file.absent: + - name: /opt/so/saltstack/default/salt/common/tools/sbin/soup + +remove_common_so-firewall: + file.absent: + - name: /opt/so/saltstack/default/salt/common/tools/sbin/so-firewall + +# Sync some Utilities +soup_scripts: + file.recurse: + - name: /usr/sbin + - user: root + - group: root + - file_mode: 755 + - source: salt://common/tools/sbin + +soup_manager_scripts: + file.recurse: + - name: /usr/sbin + - user: root + - group: root + - file_mode: 755 + - source: salt://manager/tools/sbin diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 02dd1272b..75be97928 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -795,12 +795,14 @@ verify_latest_update_script() { else echo "You are not running the latest soup version. Updating soup and its components. This might take multiple runs to complete." cp $UPDATE_DIR/salt/common/tools/sbin/* $DEFAULT_SALT_DIR/salt/common/tools/sbin/. - cp $UPDATE_DIR/salt/common/tools/sbin/* /usr/sbin/. + #cp $UPDATE_DIR/salt/common/tools/sbin/* /usr/sbin/. cp $UPDATE_DIR/salt/manager/tools/sbin/* $DEFAULT_SALT_DIR/salt/manager/tools/sbin/. - cp $UPDATE_DIR/salt/manager/tools/sbin/* /usr/sbin/. + #cp $UPDATE_DIR/salt/manager/tools/sbin/* /usr/sbin/. - rm -f $DEFAULT_SALT_DIR/salt/common/tools/sbin/soup - rm -f $DEFAULT_SALT_DIR/salt/common/tools/sbin/so-firewall + #rm -f $DEFAULT_SALT_DIR/salt/common/tools/sbin/soup + #rm -f $DEFAULT_SALT_DIR/salt/common/tools/sbin/so-firewall + + salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local echo "" echo "The soup script has been modified. Please run soup again to continue the upgrade."