diff --git a/Vagrantfile b/Vagrantfile index 3b3599e766..57bcc1b413 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ VAGRANTFILE_API_VERSION = "2" # Require a recent version of vagrant otherwise some have reported errors setting host names on boxes -Vagrant.require_version ">= 1.6.2" +Vagrant.require_version ">= 1.7.4" if ARGV.first == "up" && ENV['USING_KUBE_SCRIPTS'] != 'true' raise Vagrant::Errors::VagrantError.new, < 'kube-fedora20', - :box_url => 'https://atlas.hashicorp.com/rickard-von-essen/boxes/opscode_fedora-20/versions/0.4.0/providers/parallels.box' + :box_name => 'kube-fedora23', + :box_url => 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/parallels/opscode_fedora-23_chef-provisionerless.box' } }, :virtualbox => { 'fedora' => { - :box_name => 'kube-fedora21', - :box_url => 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-21_chef-provisionerless.box' + :box_name => 'kube-fedora23', + :box_url => 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_fedora-23_chef-provisionerless.box' } }, :libvirt => { 'fedora' => { - :box_name => 'kube-fedora21', - :box_url => 'https://amadeus.box.com/shared/static/93mj2fajrii6afeh8b5v5ihuk2ows2yn.box' + :box_name => 'kube-fedora23', + :box_url => 'https://dl.fedoraproject.org/pub/fedora/linux/releases/23/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-23-20151030.x86_64.vagrant-libvirt.box' } }, :vmware_desktop => { 'fedora' => { - :box_name => 'kube-fedora21', - :box_url => 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-21_chef-provisionerless.box' + :box_name => 'kube-fedora23', + :box_url => 'https://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_fedora-23_chef-provisionerless.box' } } } diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index 586e2ad892..4b251566d1 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -22,11 +22,7 @@ set -o pipefail # See: https://github.com/mitchellh/vagrant/issues/2430 hostnamectl set-hostname ${MASTER_NAME} -if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=21 ]]; then - # Workaround to vagrant inability to guess interface naming sequence - # Tell system to abandon the new naming scheme and use eth* instead - rm -f /etc/sysconfig/network-scripts/ifcfg-enp0s3 - +if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=23 ]]; then # Disable network interface being managed by Network Manager (needed for Fedora 21+) NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/ if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN ) @@ -108,8 +104,8 @@ fi if ! which /usr/libexec/cockpit-ws &>/dev/null; then pushd /etc/yum.repos.d - wget https://copr.fedoraproject.org/coprs/sgallagh/cockpit-preview/repo/fedora-21/sgallagh-cockpit-preview-fedora-21.repo - yum install -y cockpit cockpit-kubernetes + wget https://copr.fedoraproject.org/coprs/sgallagh/cockpit-preview/repo/fedora-22/sgallagh-cockpit-preview-fedora-22.repo + dnf install -y cockpit cockpit-kubernetes popd systemctl enable cockpit.socket diff --git a/cluster/vagrant/provision-network-master.sh b/cluster/vagrant/provision-network-master.sh index 9ca33b1624..1f8d84a868 100644 --- a/cluster/vagrant/provision-network-master.sh +++ b/cluster/vagrant/provision-network-master.sh @@ -24,7 +24,7 @@ function provision-network-master { # Install etcd for flannel data if ! which etcd >/dev/null 2>&1; then - yum install -y etcd + dnf install -y etcd # Modify etcd configuration for flannel data cat </etc/etcd/etcd.conf @@ -45,7 +45,7 @@ EOF # Install flannel for overlay if ! which flanneld >/dev/null 2>&1; then - yum install -y flannel + dnf install -y flannel cat </etc/flannel-config.json { diff --git a/cluster/vagrant/provision-network-node.sh b/cluster/vagrant/provision-network-node.sh index d977afcf97..f24e189622 100644 --- a/cluster/vagrant/provision-network-node.sh +++ b/cluster/vagrant/provision-network-node.sh @@ -24,7 +24,7 @@ function provision-network-node { # Install flannel for overlay if ! which flanneld >/dev/null 2>&1; then - yum install -y flannel + dnf install -y flannel # Configure local daemon to speak to master NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/ diff --git a/cluster/vagrant/provision-node.sh b/cluster/vagrant/provision-node.sh index edc6452c33..2fb64dd313 100755 --- a/cluster/vagrant/provision-node.sh +++ b/cluster/vagrant/provision-node.sh @@ -22,11 +22,7 @@ set -o pipefail # See: https://github.com/mitchellh/vagrant/issues/2430 hostnamectl set-hostname ${NODE_NAME} -if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=21 ]]; then - # Workaround to vagrant inability to guess interface naming sequence - # Tell system to abandon the new naming scheme and use eth* instead - rm -f /etc/sysconfig/network-scripts/ifcfg-enp0s3 - +if [[ "$(grep 'VERSION_ID' /etc/os-release)" =~ ^VERSION_ID=23 ]]; then # Disable network interface being managed by Network Manager (needed for Fedora 21+) NETWORK_CONF_PATH=/etc/sysconfig/network-scripts/ if_to_edit=$( find ${NETWORK_CONF_PATH}ifcfg-* | xargs grep -l VAGRANT-BEGIN ) diff --git a/docs/getting-started-guides/vagrant.md b/docs/getting-started-guides/vagrant.md index ae51528a8e..ccd60423a1 100644 --- a/docs/getting-started-guides/vagrant.md +++ b/docs/getting-started-guides/vagrant.md @@ -57,7 +57,7 @@ Running Kubernetes with Vagrant (and VirtualBox) is an easy way to run/test/deve ### Prerequisites -1. Install latest version >= 1.6.2 of vagrant from http://www.vagrantup.com/downloads.html +1. Install latest version >= 1.7.4 of vagrant from http://www.vagrantup.com/downloads.html 2. Install one of: 1. The latest version of Virtual Box from https://www.virtualbox.org/wiki/Downloads 2. [VMWare Fusion](https://www.vmware.com/products/fusion/) version 5 or greater as well as the appropriate [Vagrant VMWare Fusion provider](https://www.vagrantup.com/vmware)