From fafdbbc7a1902f9b54144052781fd05450aec842 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 10 May 2018 16:34:26 +0100 Subject: xci: installer: Do not use XCI_ANSIBLE_PARAMS on remote nodes The XCI_ANSIBLE_PARAMS is used to pass extra Ansible parameters to XCI. However, these parameters may not make sense when Ansible is running on any of the remote nodes, so we should't use it there. If passing information to "remote" Ansible is required, then we need to come up with a new variable. deploy-scenario:os-nosdn-nofeature installer-type:osa Change-Id: Ib6343fbfe3af1514c2e7e8948c12e3b19b455fe3 Signed-off-by: Markos Chandras --- xci/installer/kubespray/deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xci/installer/kubespray') diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh index 1a0b34bc..02a9d430 100755 --- a/xci/installer/kubespray/deploy.sh +++ b/xci/installer/kubespray/deploy.sh @@ -75,13 +75,13 @@ fi echo "Info: Using kubespray to deploy the kubernetes cluster" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "set -o pipefail; cd releng-xci/.cache/repos/kubespray;\ - ansible-playbook ${XCI_ANSIBLE_PARAMS} \ + ansible-playbook \ -i opnfv_inventory/inventory.cfg cluster.yml -b | tee setup-kubernetes.log" scp root@$OPNFV_HOST_IP:~/releng-xci/.cache/repos/kubespray/setup-kubernetes.log \ $LOG_PATH/setup-kubernetes.log cd $K8_XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ +ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-kubenet.yml echo -- cgit 1.2.3-korg