diff options
author | Markos Chandras <mchandras@suse.de> | 2017-12-06 10:26:53 +0000 |
---|---|---|
committer | Markos Chandras <mchandras@suse.de> | 2017-12-11 14:52:29 +0000 |
commit | 272820005530af9db4d06510b812f7ad60c17bd0 (patch) | |
tree | a10a890d567472cc6ed95f821695279df7537c01 /xci/xci-deploy.sh | |
parent | 598bfb45906ead1f20009020a2466f21985d210f (diff) |
xci: Use local playbooks for XCI deployments
Previously, we used to clone the releng-xci repository under a directory
in /tmp, copy our changes to that repository and then run the
xci-deploy.sh script from it. However, this made things far too complex
for deployers and developers since some playbooks were used from the
local repo whereas others were used from teh /tmp checkout. By running
everything from our local repository simplifies things a lot since we
can directly test our changes and also reduces the code we have in our
playbooks.
Change-Id: If16aa51b2846c170676df82d25cb90e26b1568b2
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/xci-deploy.sh')
-rwxr-xr-x | xci/xci-deploy.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index d5e41f66..47cc5dcd 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -163,7 +163,7 @@ echo "-------------------------------------------------------------------------" sudo sed -i "s/^Defaults.*env_reset/#&/" /etc/sudoers cd $XCI_PATH/bifrost/ sudo -E bash ./scripts/destroy-env.sh -cd $XCI_PATH/xci/playbooks +cd $XCI_PLAYBOOKS ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory provision-vm-nodes.yml cd ${OPENSTACK_BIFROST_PATH} bash ./scripts/bifrost-provision.sh @@ -181,7 +181,7 @@ echo "Info: VM nodes are provisioned!" echo "Info: Configuring localhost for openstack-ansible" echo "-----------------------------------------------------------------------" -cd $XCI_PATH/xci/playbooks +cd $XCI_PLAYBOOKS ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory configure-localhost.yml echo "-----------------------------------------------------------------------" echo "Info: Configured localhost host for openstack-ansible" @@ -199,8 +199,9 @@ echo "Info: Configured localhost host for openstack-ansible" #------------------------------------------------------------------------------- echo "Info: Configuring opnfv deployment host for openstack-ansible" echo "-----------------------------------------------------------------------" -cd ${XCI_DEVEL_ROOT} -ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i ${OPNFV_XCI_PATH}/playbooks/inventory ${OPNFV_XCI_PATH}/playbooks/configure-opnfvhost.yml +cd $XCI_PLAYBOOKS +ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \ + configure-opnfvhost.yml echo "-----------------------------------------------------------------------" echo "Info: Configured opnfv deployment host for openstack-ansible" @@ -218,8 +219,9 @@ echo "Info: Configured opnfv deployment host for openstack-ansible" if [[ $XCI_FLAVOR != "aio" ]]; then echo "Info: Configuring target hosts for openstack-ansible" echo "-----------------------------------------------------------------------" - cd $OPNFV_XCI_PATH/playbooks - ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i inventory configure-targethosts.yml + cd $XCI_PLAYBOOKS + ansible-playbook ${XCI_ANSIBLE_VERBOSITY} -i ${XCI_FLAVOR_ANSIBLE_FILE_PATH}/inventory \ + configure-targethosts.yml echo "-----------------------------------------------------------------------" echo "Info: Configured target hosts" fi |