Upgrade to Salt 3006.8 for all provisioning

saltstack · Apr 30, 2024 · 8c032a2 · 8c032a2
1 parent 3279505
commit 8c032a2
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 18 deletions.
diff --git a/golden-state-tree/os/windows/pkgs/python3.sls b/golden-state-tree/os/windows/pkgs/python3.sls
@@ -1,7 +1,7 @@
-{%- set python3_dir = 'c:\\\\Python38' %}
+{%- set python3_dir = 'c:\\\\Python310' %}
 
 python3:
   pkg.installed:
     - name: python3_x64
-    - version: '3.8.10150.0'
+    - version: '3.10.4150.0'
     - extra_install_flags: "TargetDir={{ python3_dir }} Include_doc=0 Include_tcltk=0 Include_test=0 Include_launcher=1 PrependPath=1 Shortcuts=0"
diff --git a/golden-state-tree/python-pkgs/pyyaml.sls b/golden-state-tree/python-pkgs/pyyaml.sls
@@ -8,7 +8,7 @@
 
 pyyaml:
   cmd.run:
-    - name: {{ pip }} install pyyaml==5.4.1
+    - name: {{ pip }} install pyyaml==6.0.1
     - unless:
       {%- if grains['os_family'] == 'Windows' %}
       - py -3 -c "import yaml"

diff --git a/os-images/AWS/almalinux/almalinux.pkr.hcl b/os-images/AWS/almalinux/almalinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3005.1+2103.gc1fc63d39a"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/amazonlinux/amazonlinux.pkr.hcl b/os-images/AWS/amazonlinux/amazonlinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3005.1+2103.gc1fc63d39a"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/amazonlinux2000/amazonlinux2000.pkr.hcl b/os-images/AWS/amazonlinux2000/amazonlinux2000.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.2"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/archlinux/archlinux.pkr.hcl b/os-images/AWS/archlinux/archlinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.2"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/centos/centos.pkr.hcl b/os-images/AWS/centos/centos.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/debian/debian.pkr.hcl b/os-images/AWS/debian/debian.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/fedora/fedora.pkr.hcl b/os-images/AWS/fedora/fedora.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/opensuse/opensuse.pkr.hcl b/os-images/AWS/opensuse/opensuse.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/photon/photon.pkr.hcl b/os-images/AWS/photon/photon.pkr.hcl
@@ -68,7 +68,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/rockylinux/rockylinux.pkr.hcl b/os-images/AWS/rockylinux/rockylinux.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/ubuntu/ubuntu.pkr.hcl b/os-images/AWS/ubuntu/ubuntu.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3007.0"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/AWS/windows/scripts/Provision-Salt.ps1 b/os-images/AWS/windows/scripts/Provision-Salt.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 
 $SALT_ARCHIVE_NAME="salt-$Env:SALT_VERSION-onedir-windows-$Env:OS_ARCH.zip"
-$SALT_DOWNLOAD_URL="http://salt-onedir-golden-images-provision.s3-website-us-west-2.amazonaws.com/$SALT_ARCHIVE_NAME"
+$SALT_DOWNLOAD_URL="https://repo.saltproject.io/salt/py3/onedir/minor/$Env:SALT_VERSION/$SALT_ARCHIVE_NAME"
 $DST = "$Env:TEMP\$SALT_ARCHIVE_NAME"
 Write-Host "`nDownloading $SALT_DOWNLOAD_URL ..." -ForegroundColor Yellow
 $wc = New-Object System.Net.WebClient

diff --git a/os-images/AWS/windows/windows.pkr.hcl b/os-images/AWS/windows/windows.pkr.hcl
@@ -66,7 +66,7 @@ variable "salt_provision_type" {
 
 variable "salt_provision_version" {
   type    = string
-  default = "3006.0"
+  default = "3006.8"
 }
 
 variable "salt_provision_root_dir" {

diff --git a/os-images/files/provision-salt.sh b/os-images/files/provision-salt.sh
@@ -11,8 +11,15 @@ else
     PLATFORM="macos"
 fi
 
-SALT_ARCHIVE_NAME="salt-${SALT_VERSION}-onedir-${PLATFORM}-${OS_ARCH}.tar.xz"
-SALT_DOWNLOAD_URL="http://salt-onedir-golden-images-provision.s3-website-us-west-2.amazonaws.com/${SALT_ARCHIVE_NAME}"
+if [ "${OS_ARCH}" = "aarch64" ]; then
+    SALT_ARCH="arm64"
+else
+    SALT_ARCH="${OS_ARCH}"
+fi
+
+# SALT_MAJOR_VERSION=$(echo "${SALT_VERSION}" | cut -f1 -d'.')
+SALT_ARCHIVE_NAME="salt-${SALT_VERSION}-onedir-${PLATFORM}-${SALT_ARCH}.tar.xz"
+SALT_DOWNLOAD_URL="https://repo.saltproject.io/salt/py3/onedir/minor/${SALT_VERSION}/${SALT_ARCHIVE_NAME}"
 
 if [ "$(which curl)x" != "x" ]; then
     curl -f --output /tmp/${SALT_ARCHIVE_NAME} ${SALT_DOWNLOAD_URL}