github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix vagrant issues with salt bootstrap

Browse Source
This commit is contained in:
derekwaynecarr 2016-05-24 10:05:00 -04:00
parent 071cfe6086
commit ff07195f4e
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/vagrant/provision-master.sh
View File

@ -118,8 +118,7 @@ if ! which /usr/libexec/cockpit-ws &>/dev/null; then
pushd /etc/yum.repos.d 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 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 install -y cockpit cockpit-kubernetes docker socat ethtool
dnf update -y docker
popd popd
systemctl enable cockpit.socket systemctl enable cockpit.socket

10
cluster/vagrant/provision-utils.sh
View File

@ -19,10 +19,6 @@ function prepare-package-manager() {
# Useful if a mirror is broken or slow # Useful if a mirror is broken or slow
echo "fastestmirror=True" >> /etc/dnf/dnf.conf 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 popd
if ! which salt-call >/dev/null 2>&1; then if ! which salt-call >/dev/null 2>&1; then
# Install salt binaries # Install salt from official repositories.
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s # 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 # Fedora >= 23 includes salt packages but the bootstrap is
# creating configuration for a (non-existent) salt repo anyway. # creating configuration for a (non-existent) salt repo anyway.