diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 4195170a..2f396a5b 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -28,7 +28,7 @@ Vagrant.configure(2) do |config| end server.vm.network x.fetch('net').fetch('network_type'), ip: x.fetch('ip').fetch('server') , nic_type: $private_nic_type server.vm.hostname = "server-01" - server.vm.provision "shell", path: "scripts/configure_rancher_server.sh", args: [x.fetch('admin_password'), x.fetch('version'), x.fetch('k8s_version')] + server.vm.provision "shell", path: "scripts/configure_rancher_server.sh", args: [x.fetch('admin_password'), x.fetch('rancher_version'), x.fetch('k8s_version')] end diff --git a/vagrant/config.yaml b/vagrant/config.yaml index 0147e19b..454a6524 100644 --- a/vagrant/config.yaml +++ b/vagrant/config.yaml @@ -1,5 +1,5 @@ admin_password: admin -version: latest +rancher_version: v2.4.8 ROS_version: 1.5.1 # Empty defaults to latest non-experimental available k8s_version: "" diff --git a/vagrant/scripts/configure_rancher_server.sh b/vagrant/scripts/configure_rancher_server.sh index 1c7e840c..ea11033c 100644 --- a/vagrant/scripts/configure_rancher_server.sh +++ b/vagrant/scripts/configure_rancher_server.sh @@ -2,7 +2,7 @@ rancher_ip="172.22.101.101" admin_password=${1:-password} -rancher_version=${2:-latest} +rancher_version=${2:-stable} k8s_version=$3 curlimage="appropriate/curl" jqimage="stedolan/jq"