From 544932f21fa4d5ac28732c6123f4a22cc0c183e3 Mon Sep 17 00:00:00 2001 From: Jonathan Treffler Date: Fri, 31 Oct 2025 15:21:31 +0100 Subject: [PATCH 1/3] [SaltStack] Updated python to 3.10 --- source/guide_salt.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/guide_salt.rst b/source/guide_salt.rst index 3d8adca6..5aa61536 100644 --- a/source/guide_salt.rst +++ b/source/guide_salt.rst @@ -52,15 +52,15 @@ Installation Install ------- -Installing Salt in a ``virtualenv`` using python 3.8 (latest available python on Uberspace). Also installing pygit2 (because it is a dependency for any gitfs in Salt which is very common). Packages are installed in multiple steps as updated setuptools, pip and wheel may be needed for others to install. Salt must be installed by itself due to 'global-option' being used. Download latest sample config as last step. +Installing Salt in a ``virtualenv`` using python 3.10 (look up the correct version for the current version of salt `here `)_. Also installing pygit2 (because it is a dependency for any gitfs in Salt which is very common). Packages are installed in multiple steps as updated setuptools, pip and wheel may be needed for others to install. Salt must be installed by itself due to 'global-option' being used. Download latest sample config as last step. .. code-block:: console - [isabell@stardust ~]$ virtualenv -p python3.8 ~/salt_venv + [isabell@stardust ~]$ python3.10 -m venv ~/salt_venv [isabell@stardust ~]$ source ~/salt_venv/bin/activate - (salt_venv) [isabell@stardust ~]$ pip3.8 install -U setuptools pip wheel - (salt_venv) [isabell@stardust ~]$ pip3.8 install -U pyzmq PyYAML msgpack-python jinja2 psutil futures tornado 'msgpack<1.0.0' chardet idna urllib3 certifi requests pycryptodomex distro pygit2 - (salt_venv) [isabell@stardust ~]$ MIMIC_SALT_INSTALL=1 pip3.8 install --global-option='--salt-root-dir='${HOME}'/salt_venv/' salt + (salt_venv) [isabell@stardust ~]$ pip3.10 install -U setuptools pip wheel + (salt_venv) [isabell@stardust ~]$ pip3.10 install -U pyzmq PyYAML msgpack-python jinja2 psutil futures tornado 'msgpack<1.0.0' chardet idna urllib3 certifi requests pycryptodomex distro pygit2 + (salt_venv) [isabell@stardust ~]$ MIMIC_SALT_INSTALL=1 pip3.10 install --global-option='--salt-root-dir='${HOME}'/salt_venv/' salt (salt_venv) [isabell@stardust ~]$ deactivate [isabell@stardust ~]$ mkdir -p ~/salt_venv/etc/salt ~/salt_venv/var/log/salt [isabell@stardust ~]$ curl https://raw.githubusercontent.com/saltstack/salt/master/conf/master -o ~/salt_venv/etc/salt/master @@ -135,8 +135,8 @@ Update Salt in ``virtualenv``: .. code-block:: console [isabell@stardust ~]$ source ~/salt_venv/bin/activate - (salt_venv) [isabell@stardust ~]$ pip3.8 install - (salt_venv) [isabell@stardust ~]$ MIMIC_SALT_INSTALL=1 pip3.8 install -U --global-option='--salt-root-dir='${HOME}'/salt_venv/' salt + (salt_venv) [isabell@stardust ~]$ pip3.10 install + (salt_venv) [isabell@stardust ~]$ MIMIC_SALT_INSTALL=1 pip3.10 install -U --global-option='--salt-root-dir='${HOME}'/salt_venv/' salt (salt_venv) [isabell@stardust ~]$ deactivate [isabell@stardust ~]$ supervisorctl restart salt-master From 8187182b1e8a67fa31e8e01573e958684dd4d73e Mon Sep 17 00:00:00 2001 From: Jonathan Treffler Date: Fri, 31 Oct 2025 16:28:26 +0100 Subject: [PATCH 2/3] [SaltStack] Improved dependencies install --- source/guide_salt.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/guide_salt.rst b/source/guide_salt.rst index 5aa61536..e0b0fb2f 100644 --- a/source/guide_salt.rst +++ b/source/guide_salt.rst @@ -52,15 +52,15 @@ Installation Install ------- -Installing Salt in a ``virtualenv`` using python 3.10 (look up the correct version for the current version of salt `here `)_. Also installing pygit2 (because it is a dependency for any gitfs in Salt which is very common). Packages are installed in multiple steps as updated setuptools, pip and wheel may be needed for others to install. Salt must be installed by itself due to 'global-option' being used. Download latest sample config as last step. +Installing Salt 3007.8 in a ``virtualenv`` using python 3.10. If you want to install a later version of salt look up the correct python version `here `)_ and replace the version numbers in the commands. Also installing pygit2 (because it is a dependency for any gitfs in Salt which is very common). Packages are installed in multiple steps as updated setuptools, pip and wheel may be needed for others to install. Download latest sample config as last step. .. code-block:: console [isabell@stardust ~]$ python3.10 -m venv ~/salt_venv [isabell@stardust ~]$ source ~/salt_venv/bin/activate (salt_venv) [isabell@stardust ~]$ pip3.10 install -U setuptools pip wheel - (salt_venv) [isabell@stardust ~]$ pip3.10 install -U pyzmq PyYAML msgpack-python jinja2 psutil futures tornado 'msgpack<1.0.0' chardet idna urllib3 certifi requests pycryptodomex distro pygit2 - (salt_venv) [isabell@stardust ~]$ MIMIC_SALT_INSTALL=1 pip3.10 install --global-option='--salt-root-dir='${HOME}'/salt_venv/' salt + (salt_venv) [isabell@stardust ~]$ pip3.10 install -r https://github.com/saltstack/salt/raw/refs/tags/v3007.8/requirements/base.txt + (salt_venv) [isabell@stardust ~]$ pip3.10 install salt==3007.8 (salt_venv) [isabell@stardust ~]$ deactivate [isabell@stardust ~]$ mkdir -p ~/salt_venv/etc/salt ~/salt_venv/var/log/salt [isabell@stardust ~]$ curl https://raw.githubusercontent.com/saltstack/salt/master/conf/master -o ~/salt_venv/etc/salt/master From 63ce2e879e57254ec3fdc4ba9d390d1b37268dac Mon Sep 17 00:00:00 2001 From: Jonathan Treffler Date: Fri, 31 Oct 2025 18:07:13 +0100 Subject: [PATCH 3/3] [SaltStack] Fix updates --- source/guide_salt.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/guide_salt.rst b/source/guide_salt.rst index e0b0fb2f..7df10af3 100644 --- a/source/guide_salt.rst +++ b/source/guide_salt.rst @@ -59,6 +59,7 @@ Installing Salt 3007.8 in a ``virtualenv`` using python 3.10. If you want to ins [isabell@stardust ~]$ python3.10 -m venv ~/salt_venv [isabell@stardust ~]$ source ~/salt_venv/bin/activate (salt_venv) [isabell@stardust ~]$ pip3.10 install -U setuptools pip wheel + (salt_venv) [isabell@stardust ~]$ pip3.10 install -U pygit2 (salt_venv) [isabell@stardust ~]$ pip3.10 install -r https://github.com/saltstack/salt/raw/refs/tags/v3007.8/requirements/base.txt (salt_venv) [isabell@stardust ~]$ pip3.10 install salt==3007.8 (salt_venv) [isabell@stardust ~]$ deactivate @@ -136,7 +137,7 @@ Update Salt in ``virtualenv``: [isabell@stardust ~]$ source ~/salt_venv/bin/activate (salt_venv) [isabell@stardust ~]$ pip3.10 install - (salt_venv) [isabell@stardust ~]$ MIMIC_SALT_INSTALL=1 pip3.10 install -U --global-option='--salt-root-dir='${HOME}'/salt_venv/' salt + (salt_venv) [isabell@stardust ~]$ pip3.10 install -U salt (salt_venv) [isabell@stardust ~]$ deactivate [isabell@stardust ~]$ supervisorctl restart salt-master