Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

salt-minion-py3: fix uninstall of v3004+ #1902

Closed
wants to merge 3 commits into from
Closed

salt-minion-py3: fix uninstall of v3004+ #1902

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5d4e4b
salt-minion-py3: switch to `repo.saltproject.io`
dafyddj Dec 24, 2021
89feabd
salt-minion-py3: remove unnecessary comments
dafyddj Dec 24, 2021
26a389a
salt-minion-py3: use registry install_dir for uninstaller where neces…
dafyddj Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions salt-minion-py3.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# This software definition will only work in versions of Salt newer than
# 2015.8.2. In version 2015.8.2 we added the `use_scheduler` option which
# allowed us to launch the installer using the Windows task manager.
# This option is not available in earlier versions of Salt. So, while this
# software definition will allow you to install versions of Salt older than
# 2015.8.2 you will not be able to use pkg.install to upgrade Salt again. You
# will have to upgrade Salt through another means.
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
{% set install_dir = salt["reg.read_value"]("HKLM", "SOFTWARE\\Salt Project\\Salt", "install_dir").vdata %}
{% set install_dir = install_dir or "C:\\salt" %}
salt-minion-py3:
{%
for version in [
Expand All @@ -21,23 +14,20 @@ salt-minion-py3:
'{{ version }}':
full_name: 'Salt Minion {{ version }} (Python 3)'
{% if grains['cpuarch'] == 'AMD64' %}
installer: 'https://repo.saltstack.com/windows/Salt-Minion-{{ version }}-Py3-AMD64-Setup.exe'
installer: 'https://repo.saltproject.io/windows/Salt-Minion-{{ version }}-Py3-AMD64-Setup.exe'
{% else %}
installer: 'https://repo.saltstack.com/windows/Salt-Minion-{{ version }}-Py3-x86-Setup.exe'
installer: 'https://repo.saltproject.io/windows/Salt-Minion-{{ version }}-Py3-x86-Setup.exe'
{% endif %}
{% raw %}
# install_flags: "/S /master={{ salt['pillar.get']('salt:master', 'salt.domain.tld') }} /minion-id={{ salt['pillar.get']('salt:minion:ids:' ~ grains['host'] }}"
{% endraw %}
install_flags: '/S'
uninstaller: 'C:\salt\uninst.exe'
uninstaller: '{{ install_dir }}\uninst.exe'
uninstall_flags: '/S'
msiexec: False
use_scheduler: True
reboot: False
{% endfor %}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Versions of Salt that contain CVE's have been moved to an archive at:
# archive.repo.saltstack.com/windows. The ability to install those versions
# archive.repo.saltproject.io/windows. The ability to install those versions
# using winrepo has been removed.
# An uninstall only definition will remain here so the packages will show up
# correctly in `pkg.list_pkgs` and to allow for removal using `pkg.remove`
Expand Down Expand Up @@ -98,7 +88,7 @@ salt-minion-py3:
'{{ version }}':
skip_urltest: True
full_name: 'Salt Minion {{ version }} (Python 3)'
uninstaller: 'C:\salt\uninst.exe'
uninstaller: '{{ install_dir }}\uninst.exe'
uninstall_flags: '/S'
use_scheduler: True
{% endfor %}