diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-03-12 09:47:55 +0000 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-03-12 09:47:55 +0000 |
| commit | e286a9a4aad9bfca02e35c2486414d33a4f053d7 (patch) | |
| tree | 529d1d7eff01da129fe60f270d481e8b56dd0769 /xci/installer/kubespray | |
| parent | cea2e3355bc6b5c059349c6c3ca2e96d214cbfb4 (diff) | |
xci: Rename XCI_ANSIBLE_VERBOSITY to XCI_ANSIBLE_PARAMS
We don't quite need a specific env variable just for Ansible
verbosity so we can rename this variable to make it clear that
it can be used to pass any Ansible option to XCI.
Change-Id: Ie20517d4b563bfc6daeb27848168d36da7014cee
Signed-off-by: Markos Chandras <mchandras@suse.de>
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 |