diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-13 16:20:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-13 16:20:20 +0000 |
| commit | 193e3c4784824d647541d079c54ab2d1460f9e88 (patch) | |
| tree | 3224cda88e1d8f3e8756b2cc7745cbf358d46dee /xci/installer/kubespray | |
| parent | c6ea45f88ce8c11e7b0e35b6d1c8cf233ebd556c (diff) | |
| parent | 6514b1ac8b4cc5b98085776546077cd588d0739e (diff) | |
Merge changes from topics 'allow-pass-ansible-arguments', 'allow-pass-ansible-arguments-force-verify'
* changes:
xci: OSA: Fix warning about missing inventory file
xci: Pass the XCI_PATH variable to all Ansible calls
xci: Rename XCI_ANSIBLE_VERBOSITY to XCI_ANSIBLE_PARAMS
Diffstat (limited to 'xci/installer/kubespray')
| -rwxr-xr-x | xci/installer/kubespray/deploy.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xci/installer/kubespray/deploy.sh b/xci/installer/kubespray/deploy.sh index b04ed781..548ed771 100755 --- a/xci/installer/kubespray/deploy.sh +++ b/xci/installer/kubespray/deploy.sh @@ -25,7 +25,7 @@ export ANSIBLE_ROLES_PATH=$HOME/.ansible/roles:/etc/ansible/roles:${XCI_PATH}/xc echo "Info: Configuring localhost for kubespray" echo "-----------------------------------------------------------------------" cd $XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" \ +ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-localhost.yml echo "-----------------------------------------------------------------------" @@ -44,7 +44,7 @@ echo "Info: Configured localhost for kubespray" echo "Info: Configuring opnfv deployment host for kubespray" echo "-----------------------------------------------------------------------" cd $K8_XCI_PLAYBOOKS -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" \ +ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-opnfvhost.yml echo "-----------------------------------------------------------------------" @@ -63,7 +63,7 @@ if [ $XCI_FLAVOR != "aio" ]; then echo "Info: Configuring target hosts for kubespray" echo "-----------------------------------------------------------------------" cd $K8_XCI_PLAYBOOKS - ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -e XCI_PATH="${XCI_PATH}" \ + ansible-playbook ${XCI_ANSIBLE_PARAMS} -e XCI_PATH="${XCI_PATH}" \ -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory/inventory.cfg \ configure-targethosts.yml echo "-----------------------------------------------------------------------" @@ -73,7 +73,7 @@ fi echo "Info: Using kubespray to deploy the kubernetes cluster" echo "-----------------------------------------------------------------------" ssh root@$OPNFV_HOST_IP "cd releng-xci/.cache/repos/kubespray;\ - ansible-playbook ${XCI_ANSIBLE_VERBOSITY} \ + ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -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 |