commit d589e08290d534ef539d3d51df9483a1e3d145ab
author Zack Williams <zdw@opennetworking.org> Thu Mar 01 17:21:56 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Fri Mar 02 02:02:32 2018 -0700
tree a4c58fab562ca85e653d3a88d3a82edc5639835f
parent e916a17ab7d1ce48a3db52dd0e2a9dc6acac21a4

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

[CORD-2797]
Pin kubespray release version

Change-Id: Ib80a842ab52669743ab6bb887932580d7d3dd5db

ansible/roles/finish-kubespray/defaults/main.yml

diff --git a/ansible/roles/finish-kubespray/defaults/main.yml b/ansible/roles/finish-kubespray/defaults/main.yml
index 437d960..9750267 100644
--- a/ansible/roles/finish-kubespray/defaults/main.yml
+++ b/ansible/roles/finish-kubespray/defaults/main.yml
@@ -15,7 +15,7 @@
 
 # finish-kubespray/defaults/main.yml
 
-kubespray_dir: "../kubespray"
+kubespray_dir: "{{ 'kubespray' | realpath }}"
 
 management_net_cidr: "10.1.0.0/24"
 

ansible/roles/prep-kubespray/defaults/main.yml

diff --git a/ansible/roles/prep-kubespray/defaults/main.yml b/ansible/roles/prep-kubespray/defaults/main.yml
index 7e3df07..ba1c7a9 100644
--- a/ansible/roles/prep-kubespray/defaults/main.yml
+++ b/ansible/roles/prep-kubespray/defaults/main.yml
@@ -16,7 +16,6 @@
 # prep-kubespray/defaults/main.yml
 
 kubespray_version: "master"
-kubespray_dir: "../kubespray"
+kubespray_dir: "{{ 'kubespray' | realpath }}"
 
 management_net_cidr: "10.1.0.0/24"
-

ansible/roles/prep-kubespray/tasks/main.yml

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

ansible/roles/prep-kubespray/templates/kubespray_inventory.j2

diff --git a/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2 b/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
index 6782bf2..e803340 100644
--- a/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
+++ b/ansible/roles/prep-kubespray/templates/kubespray_inventory.j2
@@ -28,3 +28,4 @@
 kube-node
 kube-master
 
+[calico-rr]