diff --git a/devstack/lib/tacker b/devstack/lib/tacker index 5114ccfbe..b34d767c6 100644 --- a/devstack/lib/tacker +++ b/devstack/lib/tacker @@ -436,26 +436,11 @@ function tacker_register_default_vim { sed -e "s|^auth_url:.*$|auth_url: \'${KEYSTONE_SERVICE_URI}\'|" -i $VIM_CONFIG_FILE echo "The content of VIM config file $VIM_CONFIG_FILE :" cat $VIM_CONFIG_FILE - DEFAULT_VIM_NAME="VIM0" # TODO(tpatil): Remove installing python-tackerclient using pip once # a solution is available to install it using requirements. pip_install python-tackerclient - cat >> $TACKER_DIR/tools/test-setup-default-vim.sh < /opt/stack/ipaddress.txt" + shell: sudo bash -c "ip address > {{ devstack_base_dir }}//ipaddress.txt" - name: Collect net information fetch: flat: yes dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/confs/devstack/ipaddress.txt" - src: "/opt/stack/ipaddress.txt" + src: "{{ devstack_base_dir }}//ipaddress.txt" - name: print ovs information - shell: sudo bash -c "ovs-vsctl show > /opt/stack/ovsvsctl.txt" + shell: sudo bash -c "ovs-vsctl show > {{ devstack_base_dir }}//ovsvsctl.txt" - name: Collect ovs information fetch: flat: yes dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/confs/devstack/ovsvsctl.txt" - src: "/opt/stack/ovsvsctl.txt" + src: "{{ devstack_base_dir }}//ovsvsctl.txt" diff --git a/tools/test-setup-default-vim.sh b/tools/test-setup-default-vim.sh index 5111041da..bde2dfb80 100755 --- a/tools/test-setup-default-vim.sh +++ b/tools/test-setup-default-vim.sh @@ -4,3 +4,25 @@ # for functional testing, which cannot be put # in devstack/plugin.sh because new zuul3 CI # cannot keep the devstack plugins order +# +# Also, this script updates the following +# parameter which has been modified +# unintentionally by ansible playbook +# `roles/setup-default-vim/tasks/main.yaml` +# according to the execution environment of +# Zuul. +# +# --os-auth-url +# --config-file + +openstack vim register \ + --os-username nfv_user \ + --os-project-name nfv \ + --os-password devstack \ + --os-auth-url http://127.0.0.1/identity \ + --os-project-domain-name Default \ + --os-user-domain-name Default \ + --is-default \ + --description "Default VIM" \ + --config-file /opt/stack/tacker/tacker/tests/etc/samples/local-vim.yaml \ + VIM0