Merge "Use run_dir instead of hard coding"

author HU Xinhui <xinhui_hu@foxmail.com>

Sat, 27 Jan 2018 02:59:48 +0000 (02:59 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Sat, 27 Jan 2018 02:59:48 +0000 (02:59 +0000)
author HU Xinhui <xinhui_hu@foxmail.com>
Sat, 27 Jan 2018 02:59:48 +0000 (02:59 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Sat, 27 Jan 2018 02:59:48 +0000 (02:59 +0000)
diff --cc deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
Simple merge
diff --cc deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl
Simple merge
author	HU Xinhui <xinhui_hu@foxmail.com>
	Sat, 27 Jan 2018 02:59:48 +0000 (02:59 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Sat, 27 Jan 2018 02:59:48 +0000 (02:59 +0000)
		1	2
deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/compass_conf/templates/ansible_installer/kubernetes/vars/ansible-kubernetes.tmpl	patch \|	diff1 \|	diff2 \|	blob \| history