Update vagrant ansible for pcn-k8s (#253)

* Fixed the host_vars folder missing
* Fixed the ssh-keys when a keyring daemon is not used
* Minor improvements regarding the network address spaces that can be used
* Vagranfile deleted
* fixed ssh private key path

Author: alacuku

.gitignore

@@ -5,3 +5,4 @@ build/*
 swagger-codegen*
 .vscode/*
 .idea/*
+Vagrantfile

tests/ansible_vagrant/kubernetes-playbooks/group_vars/all/vars.yml

@@ -23,7 +23,11 @@ apt_packages:
 #pub_key_path: /home/aldo/.ssh/vagrant_machines.pub
 
 #pod-network-cidr used in k8s
-pod_network_cidr: 10.244.0.0/16
+pod_network_cidr: 10.16.0.0/16
+
+#service-cidr used in k8s, change it to suit your needs
+
+service_cidr: 10.96.0.0/12
 
 #user to be added to the k8s group
 user: vagrant
@@ -35,20 +39,21 @@ time_zone: Europe/Rome
 #Nodes Configuration#
 #####################
 
-#Node configuration. The cluster can have only one master node and many worker nodes as needed.
+#Node configuration. The cluster can have only one master node and many worker nodes as needed. Please change those values as needed.
 k8s_master_nodes_ips: 
-- 192.168.0.23
+- 192.168.1.10
 
 k8s_worker_nodes_ips:
-- 192.168.0.24
-- 192.168.0.25
-- 192.168.0.26
-- 192.168.0.27
+- 192.168.1.11
+- 192.168.1.12
+
+#Netmask used for the network to which the node ips belong to
+netmask: 255.255.254.0
 
 #theese prefixes are used when generating the names of the nodes. Used in the host_vars files, inventory.ini and in /etc/hosts in the local system.
-k8s_master_node_prefix: k8s-master-
+k8s_master_node_prefix: k8s-1-master-
 
-k8s_worker_node_prefix: k8s-node-
+k8s_worker_node_prefix: k8s-1-node-
 
 
 ############################
@@ -67,6 +72,9 @@ ssh_key_name: vagrant_machines
 #path to the public key used to ssh to the machines, if this key does not exist than a new one is generated with the same name
 pub_key_path: "{{ssh_key_path}}/{{ssh_key_name}}.pub"
 
+#path to the private key used by vagrant and user to access the vagrant machines
+prv_key_path: "{{ssh_key_path}}/{{ssh_key_name}}"
+
 #Amount of RAM memory for a single VM
 virtual_memory_size: 4096
 

tests/ansible_vagrant/kubernetes-playbooks/roles/bootstrap/tasks/main.yml

@@ -17,6 +17,12 @@
 - name: Refresh inventory to ensure that the new generated one is used
   meta: refresh_inventory
 
+- name: Creating host_vars directory if not present
+  file:
+    path: ./host_vars
+    state: directory
+    mode: '0755'
+
 - name: Find and save in a local variable all host_vars files
   find:
     paths: ./host_vars

tests/ansible_vagrant/kubernetes-playbooks/roles/bootstrap/templates/VagrantFile.j2

@@ -9,10 +9,10 @@ Vagrant.configure("2") do |config|
         v.cpus = {{ virtual_cpus }}
     end
 {% for node_ip in k8s_master_nodes_ips %}
-    config.vm.define "k8s-master" do |master|
+    config.vm.define "{{ k8s_master_node_prefix }}-{{ loop.index }}" do |master|
         master.vm.box = IMAGE_NAME
         # change the bridge interface to match the one on your host machine
-        master.vm.network "public_network", bridge: BRIDGE_NIC, ip: "{{ node_ip }}"
+        master.vm.network "public_network", bridge: BRIDGE_NIC, ip: "{{ node_ip }}", netmask: "{{ netmask }}"
         master.vm.hostname = "k8s-master"
         master.vm.provision "ansible" do |ansible|
             # Configures the ssh-key
@@ -25,10 +25,10 @@ Vagrant.configure("2") do |config|
 {% endfor %}
 
 {% for node_ip in k8s_worker_nodes_ips %}
-    config.vm.define "node-{{ loop.index }}" do |node|
+    config.vm.define "{{ k8s_worker_node_prefix }}{{ loop.index }}" do |node|
         node.vm.box = IMAGE_NAME
         # change the bridge interface to match the one on your host machine
-        node.vm.network "public_network", bridge: BRIDGE_NIC, ip: "{{ node_ip }}"
+        node.vm.network "public_network", bridge: BRIDGE_NIC, ip: "{{ node_ip }}", netmask: "{{ netmask }}"
         node.vm.hostname = "node-{{ loop.index }}"
         node.vm.provision "ansible" do |ansible|
             # Configures the ssh-key

tests/ansible_vagrant/kubernetes-playbooks/roles/bootstrap/templates/inventory.ini.j2

@@ -10,6 +10,14 @@
  {{ k8s_worker_node_prefix}}{{ loop.index }}
 {% endfor %}
 
+#should work also for the users who do not use an ssh-agent
+[k8s_master_nodes:vars]
+ansible_ssh_private_key_file={{prv_key_path}}
+
+#should work also for the users who do not use an ssh-agent
+[k8s_worker_nodes:vars]
+ansible_ssh_private_key_file={{prv_key_path}}
+
 ## All nodes
 [all_nodes:children]
 k8s_master_nodes

tests/ansible_vagrant/kubernetes-playbooks/roles/k8s-master/tasks/main.yml

@@ -70,7 +70,7 @@
     state: restarted
 
 - name: Initialize the Kubernetes cluster using kubeadm
-  command: kubeadm init --apiserver-advertise-address="{{ node_ip }}" --apiserver-cert-extra-sans="{{ node_ip }}"  --node-name k8s-master --pod-network-cidr="{{ pod_network_cidr }}"
+  command: kubeadm init --apiserver-advertise-address="{{ node_ip }}" --apiserver-cert-extra-sans="{{ node_ip }}"  --node-name k8s-master --pod-network-cidr="{{ pod_network_cidr }}" --service-cidr="{{ service_cidr }}"
 
 - name: Enable the kernel to pass bridged IPv4 traffic to iptables' chains and the forwarding
   command: "{{ item }}"

tests/ansible_vagrant/kubernetes-playbooks/roles/vagrant-network-config/templates/50-vagrant.yaml.j2

@@ -7,6 +7,6 @@ network:
 {% if  hostvars[inventory_hostname]['ansible_'~interface|replace('-','_')]['ipv4']['address'] | default("Not defined") == node_ip %}
     {{ interface }}:
       dhcp4: true
-      addresses: [{{node_ip}}/24] #node_ip defined per host in host_vars
+      addresses: [{{node_ip}}/23] #node_ip defined per host in host_vars
 {% endif %}
 {% endfor %}