[CORD-2943] Update kubespray to 2.5, kubernetes to 1.9.5

Change-Id: I23515605160cc5036cbf308474a21f89ed3483c6
diff --git a/ansible/roles/prep-kubespray/defaults/main.yml b/ansible/roles/prep-kubespray/defaults/main.yml
index ba1c7a9..57e0818 100644
--- a/ansible/roles/prep-kubespray/defaults/main.yml
+++ b/ansible/roles/prep-kubespray/defaults/main.yml
@@ -15,7 +15,7 @@
 
 # prep-kubespray/defaults/main.yml
 
-kubespray_version: "master"
+kubespray_version: "v2.5.0"
 kubespray_dir: "{{ 'kubespray' | realpath }}"
 
 management_net_cidr: "10.1.0.0/24"
diff --git a/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2 b/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
index e803340..d0f1724 100644
--- a/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
+++ b/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
@@ -12,6 +12,9 @@
 {{ node }} ip='{{ management_net_cidr | ipaddr(npi.ipv4_last_octet) |  ipaddr("address")  }}'
 {% endfor %}
 
+[cord-headnodes:vars]
+supplementary_addresses_in_ssl_keys=['{{ hostvars[groups["head"][0]].ansible_default_ipv4.address }}']
+
 [kube-master:children]
 cord-headnodes
 cord-computenodes