[CORD-2795]
Fix kubespray inventory to use new location

[CORD-2797]
Pin kubespray release version

Change-Id: Ib80a842ab52669743ab6bb887932580d7d3dd5db
diff --git a/ansible/roles/prep-kubespray/tasks/main.yml b/ansible/roles/prep-kubespray/tasks/main.yml
index 6616ac4..da81e88 100644
--- a/ansible/roles/prep-kubespray/tasks/main.yml
+++ b/ansible/roles/prep-kubespray/tasks/main.yml
@@ -21,8 +21,24 @@
     dest: "{{ kubespray_dir }}"
     version: "{{ kubespray_version }}"
 
-- name: Create kubespray inventory
+- name: Create kubespray inventory directory
+  file:
+    state: directory
+    dest: "{{ kubespray_dir }}/inventory/cord"
+    mode: 0755
+  with_items:
+    - "{{ kubespray_dir }}/inventory/cord/group_vars"
+
+# NOTE: override vars set in kubespray group_vars files using the scenario
+# config.yml file
+- name: Link group_vars directory from sample to cord directory
+  file:
+    state: link
+    src: "{{ kubespray_dir }}/inventory/sample/group_vars"
+    dest: "{{ kubespray_dir }}/inventory/cord/group_vars"
+
+- name: Create kubespray inventory file
   template:
     src: kubespray_inventory.j2
-    dest: "{{ kubespray_dir }}/inventory/inventory.cord"
+    dest: "{{ kubespray_dir }}/inventory/cord/hosts.ini"
     mode: 0644