diff options
Diffstat (limited to 'test/integration/targets/vmware_inventory')
-rwxr-xr-x | test/integration/targets/vmware_inventory/runme.sh | 11 | ||||
-rw-r--r-- | test/integration/targets/vmware_inventory/test_vmware_inventory.yml | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/test/integration/targets/vmware_inventory/runme.sh b/test/integration/targets/vmware_inventory/runme.sh index 9a713e4f3a..a4c4bf5605 100755 --- a/test/integration/targets/vmware_inventory/runme.sh +++ b/test/integration/targets/vmware_inventory/runme.sh @@ -9,8 +9,7 @@ contrib_dir=../../../../contrib/inventory echo "DEBUG: using ${contrib_dir}" export ANSIBLE_CONFIG=ansible.cfg -export vcenter_host="${vcenter_host:-0.0.0.0}" -export VMWARE_SERVER="${vcenter_host}" +export VMWARE_SERVER="${VCENTER_HOST}" export VMWARE_USERNAME="${VMWARE_USERNAME:-user}" export VMWARE_PASSWORD="${VMWARE_PASSWORD:-pass}" @@ -42,16 +41,16 @@ function cleanup { fi } -echo "DEBUG: Using ${vcenter_host} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" +echo "DEBUG: Using ${VCENTER_HOST} with username ${VMWARE_USERNAME} and password ${VMWARE_PASSWORD}" echo "Kill all previous instances" -curl "http://${vcenter_host}:5000/killall" > /dev/null 2>&1 +curl "http://${VCENTER_HOST}:5000/killall" > /dev/null 2>&1 echo "Start new VCSIM server" -curl "http://${vcenter_host}:5000/spawn?datacenter=1&cluster=1&folder=0" > /dev/null 2>&1 +curl "http://${VCENTER_HOST}:5000/spawn?datacenter=1&cluster=1&folder=0" > /dev/null 2>&1 echo "Debugging new instances" -curl "http://${vcenter_host}:5000/govc_find" +curl "http://${VCENTER_HOST}:5000/govc_find" # Get inventory ansible-playbook -i ./vmware_inventory.sh "./test_vmware_inventory.yml" --connection=local "$@" diff --git a/test/integration/targets/vmware_inventory/test_vmware_inventory.yml b/test/integration/targets/vmware_inventory/test_vmware_inventory.yml index 9cd8ff8917..4aa994ade0 100644 --- a/test/integration/targets/vmware_inventory/test_vmware_inventory.yml +++ b/test/integration/targets/vmware_inventory/test_vmware_inventory.yml @@ -8,10 +8,7 @@ tasks: - name: store the vcenter container ip set_fact: - vcsim: "{{ lookup('env', 'vcenter_host') }}" - - - debug: - var: vcsim + vcsim: "{{ lookup('env', 'VCENTER_HOST') }}" - name: Check that groups present in inventory assert: |