Updated from OpenStack Ansible Tests

Change-Id: I24403fa111f48244f4f1c47b1800897b86ee4f46

Vagrantfile

@@ -1,6 +1,6 @@
 # Note:
 # This file is maintained in the openstack-ansible-tests repository.
-# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/Vagrantfile
+# https://opendev.org/openstack/openstack-ansible-tests/src/Vagrantfile
 #
 # If you need to perform any change on it, you should modify the central file,
 # then, an OpenStack CI job will propagate your changes to every OSA repository
@@ -41,14 +41,14 @@ Vagrant.configure(2) do |config|
     bionic.vm.box = "ubuntu/bionic64"
   end
 
-  config.vm.define "opensuse423" do |leap423|
-    leap423.vm.box = "opensuse/openSUSE-42.3-x86_64"
-  end
-
   config.vm.define "opensuse150" do |leap150|
     leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
   end
 
+  config.vm.define "opensuse151" do |leap151|
+    leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
+  end
+
   config.vm.define "centos7" do |centos7|
     centos7.vm.box = "centos/7"
   end

bindep.txt

@@ -3,7 +3,7 @@
 #
 # See the following for details:
 #  - https://docs.openstack.org/infra/bindep/
-#  - https://git.openstack.org/cgit/openstack-infra/bindep
+#  - https://opendev.org/openstack-infra/bindep
 #
 # Even if the role does not make use of this facility, it
 # is better to have this file empty, otherwise OpenStack-CI
@@ -12,7 +12,7 @@
 #
 # Note:
 # This file is maintained in the openstack-ansible-tests repository.
-# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/bindep.txt
+# https://opendev.org/openstack/openstack-ansible-tests/src/bindep.txt
 # If you need to remove or add extra dependencies, you should modify
 # the central file instead and once your change is accepted then update
 # this file as well. The purpose of this file is to ensure that Python and

run_tests.sh

@@ -21,7 +21,7 @@
 
 # WARNING:
 # This file is maintained in the openstack-ansible-tests repository.
-# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh
+# https://opendev.org/openstack/openstack-ansible-tests/src/run_tests.sh
 # If you need to modify this file, update the one in the openstack-ansible-tests
 # repository and then update this file as well. The purpose of this file is to
 # prepare the host and then execute all the tox tests.
@@ -75,7 +75,7 @@ if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
         ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}"
 
     # In zuul v3 any dependent repository is placed into
-    # /home/zuul/src/git.openstack.org, so we check to see
+    # /home/zuul/src/opendev.org, so we check to see
     # if there is a tests checkout there already. If so, we
     # symlink that and use it.
     elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then
@@ -85,7 +85,7 @@ if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then
     # repo in some way, so just clone it from upstream.
     else
         git clone -b "${TESTING_BRANCH}" \
-            https://git.openstack.org/openstack/openstack-ansible-tests \
+            https://opendev.org/openstack/openstack-ansible-tests \
             "${COMMON_TESTS_PATH}"
     fi
 fi

tasks/mq_setup.yml

@@ -15,7 +15,7 @@
 
 # WARNING:
 # This file is maintained in the openstack-ansible-tests repository.
-# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/tasks/mq_setup.yml
+# https://opendev.org/openstack/openstack-ansible-tests/src/sync/tasks/mq_setup.yml
 # If you need to modify this file, update the one in the openstack-ansible-tests
 # repository. Once it merges there, the changes will automatically be proposed to
 # all the repositories which use it.
@@ -67,7 +67,8 @@
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
       when:
-        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+        - (_oslomsg_rpc_vhost is undefined) or
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Apply Notify RabbitMQ vhost policies
       rabbitmq_policy:
@@ -78,21 +79,23 @@
         vhost: "{{ _oslomsg_notify_vhost }}"
       loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
       when:
-        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+        - (_oslomsg_rpc_vhost is undefined) or
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Add Notify RabbitMQ user
       rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
         password: "{{ _oslomsg_notify_password }}"
+        update_password: always
         vhost: "{{ _oslomsg_notify_vhost }}"
         configure_priv: ".*"
         read_priv: ".*"
         write_priv: ".*"
         state: "present"
-        force: true
       no_log: true
       when:
-        - _oslomsg_notify_userid != _oslomsg_rpc_userid
+        - (_oslomsg_rpc_userid is undefined) or
+          (_oslomsg_notify_userid != _oslomsg_rpc_userid)
 
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"