From ff07195f4eff695fa5472a5d2515b3dcfac84623 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Tue, 24 May 2016 10:05:00 -0400 Subject: [PATCH] Fix vagrant issues with salt bootstrap --- cluster/vagrant/provision-master.sh | 3 +-- cluster/vagrant/provision-utils.sh | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index 99f1de04c76..043df2f7a38 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -118,8 +118,7 @@ if ! which /usr/libexec/cockpit-ws &>/dev/null; then pushd /etc/yum.repos.d curl -OL https://copr.fedorainfracloud.org/coprs/g/cockpit/cockpit-preview/repo/fedora-23/msuchy-cockpit-preview-fedora-23.repo - dnf install -y cockpit cockpit-kubernetes socat ethtool - dnf update -y docker + dnf install -y cockpit cockpit-kubernetes docker socat ethtool popd systemctl enable cockpit.socket diff --git a/cluster/vagrant/provision-utils.sh b/cluster/vagrant/provision-utils.sh index 30d612a0984..14481762450 100755 --- a/cluster/vagrant/provision-utils.sh +++ b/cluster/vagrant/provision-utils.sh @@ -19,10 +19,6 @@ function prepare-package-manager() { # Useful if a mirror is broken or slow echo "fastestmirror=True" >> /etc/dnf/dnf.conf - - # In Fedora 23, installed version does not work with Salt - # Cf. https://github.com/saltstack/salt/issues/31001 - dnf update -y dnf dnf-plugins-core } @@ -113,8 +109,10 @@ function install-salt() { popd if ! which salt-call >/dev/null 2>&1; then - # Install salt binaries - curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s + # Install salt from official repositories. + # Need to enable testing-repos to get version of salt with fix for dnf-core-plugins + dnf config-manager --set-enabled updates-testing + dnf install -y salt-minion # Fedora >= 23 includes salt packages but the bootstrap is # creating configuration for a (non-existent) salt repo anyway.