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

Makefile

diff --git a/Makefile b/Makefile
index ac4e8c7..d2b84af 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@
 VAGRANT          ?= VAGRANT_CWD=$(VAGRANT_CWD) vagrant
 ANSIBLE          ?= ansible -i $(INVENTORY)
 ANSIBLE_PB       ?= ansible-playbook $(ANSIBLE_ARGS) -i $(INVENTORY) --extra-vars @$(MASTER_CONFIG)
-ANSIBLE_PB_KS    ?= ANSIBLE_CONFIG=../ansible.cfg ansible-playbook $(ANSIBLE_ARGS) -b -i inventory/inventory.cord --extra-vars @../$(MASTER_CONFIG)
+ANSIBLE_PB_KS    ?= ANSIBLE_CONFIG=../ansible.cfg ansible-playbook $(ANSIBLE_ARGS) -b -i inventory/cord/hosts.ini --extra-vars @../$(MASTER_CONFIG)
 ANSIBLE_PB_LOCAL ?= ansible-playbook $(ANSIBLE_ARGS) -i $(PI)/inventory/head-localhost $(EXTRA_VARS)
 ANSIBLE_PB_MAAS  ?= ansible-playbook $(ANSIBLE_ARGS) -i /etc/maas/ansible/pod-inventory $(EXTRA_VARS)
 IMAGEBUILDER     ?= python $(BUILD)/scripts/imagebuilder.py