diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-15 16:48:45 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-09-15 17:56:36 +0100 |
| commit | e2ea3110c72884b495721101bb7cdf49c8bf4e52 (patch) | |
| tree | 0f529f9e5831e86561d9661d43a86a1722255e1b /bifrost | |
| parent | 3f04e1fd72b14420788af64b14c35a5f74727f82 (diff) | |
xci: env-vars: Bump Ansible version to 2.3.2.0
Now that bifrost uses virtual env for Ansible we can go ahead and
bump the Ansible version to match the one from OSA so we can make use of
the latest features. Furthremore, we stop passing ANSIBLE_VERBOSITY to
the command line since it's an environment variable so Ansible already
knows about it.
Change-Id: I52d9a211fc0ced1f7830f6945b2943f35d38109b
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'bifrost')
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 0cca82da..dab55f74 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -14,7 +14,6 @@ export PYTHONUNBUFFERED=1 SCRIPT_HOME="$(cd "$(dirname "$0")" && pwd)" BIFROST_HOME=$SCRIPT_HOME/.. ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack} -ANSIBLE_VERBOSITY=${ANSIBLE_VERBOSITY-"-vvvv"} ENABLE_VENV="false" USE_DHCP="false" USE_VENV="true" @@ -98,12 +97,10 @@ cd $BIFROST_HOME/playbooks # Syntax check of dynamic inventory test path for task in syntax-check list-tasks; do - ${ANSIBLE} ${ANSIBLE_VERBOSITY} \ - -i inventory/localhost \ + ${ANSIBLE} -i inventory/localhost \ test-bifrost-create-vm.yaml \ --${task} - ${ANSIBLE} ${ANSIBLE_VERBOSITY} \ - -i inventory/localhost \ + ${ANSIBLE} -i inventory/localhost \ ${TEST_PLAYBOOK} \ --${task} \ -e testing_user=${TESTING_USER} @@ -120,8 +117,7 @@ if [[ -e /etc/centos-release ]]; then fi # Create the VMS -${ANSIBLE} ${ANSIBLE_VERBOSITY} \ - -i inventory/localhost \ +${ANSIBLE} -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ @@ -130,8 +126,7 @@ ${ANSIBLE} ${ANSIBLE_VERBOSITY} \ -e ${INVENTORY_FILE_FORMAT}=${BAREMETAL_DATA_FILE} # Execute the installation and VM startup test -${ANSIBLE} ${ANSIBLE_VERBOSITY} \ - -i inventory/bifrost_inventory.py \ +${ANSIBLE} -i inventory/bifrost_inventory.py \ ${TEST_PLAYBOOK} \ -e use_cirros=${USE_CIRROS} \ -e testing_user=${TESTING_USER} \ |