Skip to content

K
k3s
Commit 0bf3f3ef authored by Olivier Lemasle's avatar Olivier Lemasle
Browse files
Options

Fix Vagrant issue with Salt

Package manager "dnf" does not work correctly with Salt (cf https://github.com/saltstack/salt/issues/31001) It causes Salt to consider that some packages (python, git, curl, etc.) are not installed, which breaks the Vagrant Kubernetes setup. Updating dnf and dnf-plugins-core to their latest version solves the issue. Additionally, I've added the "fastestmirror" to dnf, which is useful if a RPM mirror is broken or very slow. (In my case, dnf used a broken mirror which froze the Kubernetes setup).
parent 807e5f08
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 0 deletions
cluster/vagrant/provision-master.sh
View file @ 0bf3f3ef
...@@ -56,6 +56,8 @@ done ...@@ -56,6 +56,8 @@ done
echo "127.0.0.1 localhost" >> /etc/hosts # enables cmds like 'kubectl get pods' on master. echo "127.0.0.1 localhost" >> /etc/hosts # enables cmds like 'kubectl get pods' on master.
echo "$MASTER_IP $MASTER_NAME" >> /etc/hosts echo "$MASTER_IP $MASTER_NAME" >> /etc/hosts
prepare-package-manager
# Configure the master network # Configure the master network
if [ "${NETWORK_PROVIDER}" != "kubenet" ]; then if [ "${NETWORK_PROVIDER}" != "kubenet" ]; then
provision-network-master provision-network-master
......
cluster/vagrant/provision-node.sh
View file @ 0bf3f3ef
...@@ -52,6 +52,8 @@ for (( i=0; i<${#NODE_NAMES[@]}; i++)); do ...@@ -52,6 +52,8 @@ for (( i=0; i<${#NODE_NAMES[@]}; i++)); do
fi fi
done done
prepare-package-manager
# Configure network # Configure network
if [ "${NETWORK_PROVIDER}" != "kubenet" ]; then if [ "${NETWORK_PROVIDER}" != "kubenet" ]; then
provision-network-node provision-network-node
......
cluster/vagrant/provision-utils.sh
View file @ 0bf3f3ef
...@@ -14,6 +14,17 @@ ...@@ -14,6 +14,17 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
function prepare-package-manager() {
echo "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
}
function write-salt-config() { function write-salt-config() {
local role="$1" local role="$1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment