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

Jump to bottom

Upgrade to latest Salt 3006.x for all provisioning #1845

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Upgrade to latest Salt 3006.x for all provisioning #1845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions golden-state-tree/os/windows/pkgs/python3.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion golden-state-tree/python-pkgs/pyyaml.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/almalinux/almalinux.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/amazonlinux/amazonlinux.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/amazonlinux2000/amazonlinux2000.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/archlinux/archlinux.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/centos/centos.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/debian/debian.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/fedora/fedora.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/opensuse/opensuse.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions os-images/AWS/photon/photon.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down Expand Up @@ -184,7 +184,7 @@ build {
inline = [
"systemctl mask tmp.mount",
"find /etc/yum.repos.d -type f -exec sed -i 's!dl.bintray.com/vmware!packages.vmware.com/photon/$releasever!' {} ';'",
"tdnf update -y",
"if [ ${var.distro_version} == '4' ]; then tdnf update -y photon-repos-4.0-3.ph4 --enablerepo=photon --refresh ; else tdnf update -y; fi",
]
inline_shebang = "/bin/sh -ex"
}
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/rockylinux/rockylinux.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/ubuntu/ubuntu.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/windows/scripts/Provision-Salt.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion os-images/AWS/windows/windows.pkr.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
11 changes: 9 additions & 2 deletions os-images/files/provision-salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading