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

Merge pull request #20821 from olivierlemasle/fix-dnf-vagrant

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-09 07:04:24 -08:00
commit 8e4a821ab3
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

2
cluster/vagrant/provision-node.sh
View File

@ -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

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

@ -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"