fix vagrant issues

Author: bbh

.gitignore

@@ -4,3 +4,4 @@ ansible/tmp
 *.retry
 .vagrant
 vagrant/tmp
+vagrant/*.log

.ssh/config

@@ -33,16 +33,16 @@ Host k8s-worker-03
 # vagrant
 #
 Host vk8s-master
-  Hostname 10.0.70.10
+  Hostname 192.168.50.10
   IdentityFile ~/.ssh/id_rsa
   User vagrant
 
 Host vk8s-worker-01
-  Hostname 10.0.70.11
+  Hostname 192.168.50.11
   IdentityFile ~/.ssh/id_rsa
   User vagrant
 
 Host vk8s-worker-02
-  Hostname 10.0.70.12
+  Hostname 192.168.50.12
   IdentityFile ~/.ssh/id_rsa
   User vagrant

ansible/inventories/vagrant/group_vars/all.yml

@@ -1,5 +1,5 @@
-k8s_subnet: "10.0.70.0/16"
-k8s_node_00_ip: "10.0.70.10"
-k8s_node_01_ip: "10.0.70.11"
-k8s_node_02_ip: "10.0.70.12"
+k8s_subnet: "192.168.0.0/16"
+k8s_node_00_ip: "192.168.50.10"
+k8s_node_01_ip: "192.168.50.11"
+k8s_node_02_ip: "192.168.50.12"
 os_username: "vagrant"

ansible/playbooks/roles/k8s/tasks/config.yml

@@ -11,26 +11,26 @@
     state: directory
   become_user: "{{ os_username }}"
   when: ansible_host in groups['k8s_masters']
-  tags: init
+  tags: init, config
 
 - name: copy | config - Copy kubernetes config to local
   copy:
     src: /etc/kubernetes/admin.conf
-    dest: /home/ubuntu/.kube/config
+    dest: "/home/{{ os_username }}/.kube/config"
     remote_src: yes
     owner: "{{ os_username }}"
     group: "{{ os_username }}"
   become: yes
   when: ansible_host in groups['k8s_masters']
-  tags: init
+  tags: init, config
 
 - name: shell | config - Apply calico network
   shell: kubectl apply -f https://docs.projectcalico.org/manifests/calico.yaml
   environment:
-    KUBECONFIG: /home/ubuntu/.kube/config
+    KUBECONFIG: "/home/{{ os_username }}/.kube/config"
   become_user: "{{ os_username }}"
   when: ansible_host in groups['k8s_masters']
-  tags: init
+  tags: init, config
 
 - name: shell | config - Generate join command
   shell: kubeadm token create --print-join-command 2>/dev/null

vagrant/Vagrantfile

@@ -1,8 +1,8 @@
-k8s_master_ip = '10.0.70.10'
-k8s_worker_01_ip = '10.0.70.11'
-k8s_worker_02_ip = '10.0.70.12'
+ip_range = '192.168.50'
+nodes = 2
 
 $script = <<SCRIPT
+swapoff -a
 if [ ! -d /home/vagrant/.ssh ]; then mkdir /home/vagrant/.ssh; fi
 echo $(cat /vagrant/tmp/id_rsa.pub) >> /home/vagrant/.ssh/authorized_keys
 chmod 600 /home/vagrant/.ssh/authorized_keys && chmod 700 /home/vagrant/.ssh
@@ -23,31 +23,25 @@ Vagrant.configure("2") do |config|
   if Vagrant.has_plugin?("vagrant-cachier")
     config.cache.scope = :machine
     config.cache.auto_detect = false
-    config.cache.enable :gem
-    config.cache.enable :npm
     config.cache.enable :apt
   end
 
-  config.vm.define "router" do |rt|
-    rt.vm.box = "eugenmayer/opnsense"
-  end
+#  config.vm.define "router" do |rt|
+#    rt.vm.box = "eugenmayer/opnsense"
+#  end
 
-  config.vm.define "k8s-master" do |km|
+  config.vm.define "master" do |km|
     km.vm.hostname = "vk8s-master"
-    km.vm.network "private_network", ip: k8s_master_ip
+    km.vm.network "private_network", ip: "#{ip_range}.10"
     km.vm.provision "shell", inline: $script
   end
 
-  config.vm.define "k8s-worker-01" do |w01|
-    w01.vm.hostname = "vk8s-worker-01"
-    w01.vm.network "private_network", ip: k8s_worker_01_ip
-    w01.vm.provision "shell", inline: $script
-  end
-
-  config.vm.define "k8s-worker-02" do |w02|
-    w02.vm.hostname = "vk8s-worker-02"
-    w02.vm.network "private_network", ip: k8s_worker_02_ip
-    w02.vm.provision "shell", inline: $script
-  end
+  (1..nodes).each do |i|
+    config.vm.define "worker-#{i}" do |node|
+      node.vm.hostname = "vk8s-worker-01"
+      node.vm.network "private_network", ip: "#{ip_range}.#{10 + i}"
+      node.vm.provision "shell", inline: $script
+    end
+   end
 
 end