Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-11-07 16:44:54 +01:00
Code Issues Activity

fix: enforce string values for versions

Browse Source 
* to handle version numbers such as `3006.30`
This commit is contained in:
Dafydd Jones committed 2026-11-03 17:42:53 +00:00
1 parent a9fe3c2807
commit ad6e2b3667
9 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pillar.example
+2 -2
View File
@@ -22,7 +22,7 @@ salt:
install_packages: true
# Optional: set salt version (if install_packages is set to true)
version: '3006.9'
version: !!str '3006.9'
# Pin version provided under 'version' key by using apt-pinning
# available only on Debian family OS-es
@@ -48,7 +48,7 @@ salt:
# To get the available releases:
# * https://packages.broadcom.com/artifactory/saltproject-rpm/
# * https://packages.broadcom.com/artifactory/saltproject-deb
release: '3006'
release: !!str '3006'
# MacOS has no package management.
# Instead, we use file.managed to download an appropriate .pkg file and
salt/api.sls
+1 -1
View File
@@ -8,7 +8,7 @@ salt-api:
pkg.installed:
- name: {{ salt_settings.salt_api }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{% endif %}
{% if salt_settings.api_service_details.state != 'ignore' %}
salt/cloud.sls
+1 -1
View File
@@ -22,7 +22,7 @@ salt-cloud:
pkg.installed:
- name: {{ salt_settings.salt_cloud }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{%- if salt_settings.use_pip %}
- require:
salt/master.sls
+1 -1
View File
@@ -25,7 +25,7 @@ salt-master:
pkg.installed:
- name: {{ salt_settings.salt_master }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{% if salt_settings.master_service_details.state != 'ignore' %}
- require_in:
salt/minion.sls
+2 -2
View File
@@ -33,7 +33,7 @@ download-salt-minion:
pkg.installed:
- name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{% endif %}
{%- endif %}
@@ -72,7 +72,7 @@ salt-minion:
pkg.installed:
- name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{% if salt_settings.minion_service_details.state != 'ignore' %}
- require_in:
salt/ssh.sls
+1 -1
View File
@@ -6,7 +6,7 @@ ensure-salt-ssh-is-installed:
pkg.installed:
- name: {{ salt_settings.salt_ssh }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{% endif %}
salt/standalone.sls
+1 -1
View File
@@ -6,7 +6,7 @@ salt-minion-standalone:
pkg.installed:
- name: {{ salt_settings.salt_minion }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
{% endif %}
file.recurse:
salt/syndic.sls
+1 -1
View File
@@ -8,7 +8,7 @@ salt-syndic:
pkg.installed:
- name: {{ salt_settings.salt_syndic }}
{%- if salt_settings.version is defined %}
- version: {{ salt_settings.version }}
- version: !!str {{ salt_settings.version }}
{%- endif %}
- require_in:
- service: salt-syndic
test/salt/pillar/salt.sls
+1 -1
View File
@@ -7,7 +7,7 @@ salt:
# don't upgrade it to the repo's "latest" in place mid-converge — swapping the
# running onedir breaks the post-install module refresh, which raises:
# ModuleNotFoundError: spec not found for the module 'site'
version: "{{ salt['grains.get']('saltversion') }}"
version: !!str "{{ salt['grains.get']('saltversion') }}"
# Override used for FreeBSD minion service
retry_options:
attempts: 5