From 4bbeec4733a51a0e90c4d42cc45782d4c72ce01b Mon Sep 17 00:00:00 2001 From: Shane Lee Date: Fri, 12 Mar 2021 12:59:34 -0700 Subject: [PATCH] Update urls for the bootstrap scripts used by salt-masterless provider (#10755) * Fix salt masterless url. Use saltproject.io * Specify Tls12 --- provisioner/salt-masterless/provisioner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 73fb3c0d2..5c3d098c7 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -101,7 +101,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ tempDir: "/tmp/salt", stateRoot: "/srv/salt", pillarRoot: "/srv/pillar", - bootstrapFetchCmd: "curl -L https://bootstrap.saltstack.com -o /tmp/install_salt.sh || wget -O /tmp/install_salt.sh https://bootstrap.saltstack.com", + bootstrapFetchCmd: "curl -L https://bootstrap.saltproject.io -o /tmp/install_salt.sh || wget -O /tmp/install_salt.sh https://bootstrap.saltproject.io", bootstrapRunCmd: "sh /tmp/install_salt.sh", }, guestexec.WindowsOSType: { @@ -109,7 +109,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{ tempDir: "C:/Windows/Temp/salt/", stateRoot: "C:/salt/state", pillarRoot: "C:/salt/pillar/", - bootstrapFetchCmd: "powershell Invoke-WebRequest -Uri 'https://raw.githubusercontent.com/saltstack/salt-bootstrap/stable/bootstrap-salt.ps1' -OutFile 'C:/Windows/Temp/bootstrap-salt.ps1'", + bootstrapFetchCmd: "powershell -Command \"[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'; Invoke-WebRequest -Uri 'https://winbootstrap.saltproject.io' -OutFile 'C:/Windows/Temp/bootstrap-salt.ps1'\"", bootstrapRunCmd: "Powershell C:/Windows/Temp/bootstrap-salt.ps1", }, }