Merge "Update openstack.org -> opendev.org"

README.rst

@@ -20,7 +20,7 @@ Release notes for the project can be found at:
   https://docs.openstack.org/releasenotes/openstack-ansible-os_tempest
 
 The project source code repository is located at:
-  https://git.openstack.org/cgit/openstack/openstack-ansible-os_tempest
+  https://opendev.org/openstack/openstack-ansible-os_tempest
 
 The project home is at:
   https://launchpad.net/openstack-ansible

defaults/main.yml

@@ -43,11 +43,11 @@ tempest_run: no
 # We comment `tempest_git_repo` so that the repo_build role does not attempt to
 # build the wheel from this repo/branch. Instead, we want tempest to get built
 # from the stable release defined in global requirements.
-#tempest_git_repo: https://git.openstack.org/openstack/tempest
+#tempest_git_repo: https://opendev.org/openstack/tempest
 tempest_git_install_branch: master
-tempest_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}"
+tempest_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
 tempest_git_constraints:
-  - "{{ (tempest_git_repo is defined) | ternary('git+' ~ (tempest_git_repo | default('https://git.openstack.org/openstack/tempest')) ~ '@' ~ tempest_git_install_branch ~ '#egg=tempest', '') }}"
+  - "{{ (tempest_git_repo is defined) | ternary('git+' ~ (tempest_git_repo | default('https://opendev.org/openstack/tempest.git')) ~ '@' ~ tempest_git_install_branch ~ '#egg=tempest', '') }}"
   - "--constraint {{ tempest_upper_constraints_url }}"
 
 tempest_pip_install_args: "{{ pip_install_options | default('') }}"
@@ -65,7 +65,7 @@ tempest_log_dir: "/var/log/tempest"
 # on your installation.
 # The structure of each item of the list is the following:
 #   - name: designate-tempest-plugin                                     #name of the plugin
-#     repo: https://git.openstack.org/openstack/designate-tempest-plugin #for installing the plugin from sources
+#     repo: https://opendev.org/openstack/designate-tempest-plugin #for installing the plugin from sources
 #     branch: master                                                     #for installing the plugin from sources
 #   - name: ironic-tempest-plugin
 #     package: ironic                                                    #for installing the plugin from packages
@@ -311,10 +311,10 @@ tempest_tempestconf_venv_bin: "/openstack/venvs/tempestconf/bin"
 # We comment out `tempest_tempestconf_git_repo` so that the repo_build role does not attempt to
 # build the wheel from this repo/branch. Instead, we want python-tempestconf to get built
 # from the stable release defined in global requirements.
-# tempest_tempestconf_git_repo: https://git.openstack.org/openstack/python-tempestconf
+# tempest_tempestconf_git_repo: https://opendev.org/openstack/python-tempestconf
 tempest_tempestconf_git_install_branch: master
 tempest_tempestconf_git_constraints:
-  - "{{ (tempest_tempestconf_git_repo is defined) | ternary('git+' ~ (tempest_tempestconf_git_repo | default('https://git.openstack.org/openstack/python-tempestconf')) ~ '@' ~ tempest_tempestconf_git_install_branch ~ '#egg=python_tempestconf', '') }}"
+  - "{{ (tempest_tempestconf_git_repo is defined) | ternary('git+' ~ (tempest_tempestconf_git_repo | default('https://opendev.org/openstack/python-tempestconf')) ~ '@' ~ tempest_tempestconf_git_install_branch ~ '#egg=python_tempestconf', '') }}"
   - "--constraint {{ tempest_upper_constraints_url }}"
 tempest_tempestconf_pip_packages:
   - python-tempestconf

doc/source/conf.py

@@ -68,7 +68,7 @@ title = 'OpenStack-Ansible Documentation: ' + role_name + 'role'
 
 # The link to the browsable source code (for the left hand menu)
 oslosphinx_cgit_link = (
-    "https://git.openstack.org/cgit/openstack/{}".format(target_name)
+    "https://opendev.org/openstack/{}".format(target_name)
 )
 
 # The version info for the project you're documenting, acts as replacement for

doc/source/user/installation.rst

@@ -5,14 +5,14 @@ Installation
 This page describes how to install ``os_tempest`` role.
 
 To clone or view the source code of ``os_tempest``, visit the role repository
-for `os_tempest <https://git.openstack.org/cgit/openstack/openstack-ansible-os_tempest>`_.
+for `os_tempest <https://opendev.org/openstack/openstack-ansible-os_tempest>`_.
 
 Install dependencies via ``ansible-galaxy``:
 
 .. code-block:: shell
 
     $ mkdir ~/.ansible/roles -p
-    $ git clone https://git.openstack.org/openstack/openstack-ansible-os_tempest ~/.ansible/roles/os_tempest
+    $ git clone https://opendev.org/openstack/openstack-ansible-os_tempest ~/.ansible/roles/os_tempest
     $ ansible-galaxy install -r ~/.ansible/roles/os_tempest/requirements.yml --roles-path=~/.ansible/roles/
 
 Then you need to export a couple of variables, `ANSIBLE_ROLES_PATH` which

releasenotes/source/conf.py

@@ -64,7 +64,7 @@ title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
 # The link to the browsable source code (for the left hand menu)
 oslosphinx_cgit_link = (
-    "https://git.openstack.org/cgit/openstack/{}".format(target_name)
+    "https://opendev.org/openstack/{}".format(target_name)
 )
 
 # Release notes do not need a version number in the title, they

requirements.yml

@@ -1,8 +1,8 @@
 # python_venv_build ansible role
 - name: python_venv_build
-  src: git+https://git.openstack.org/openstack/ansible-role-python_venv_build.git
+  src: https://opendev.org/openstack/ansible-role-python_venv_build.git
   version: master
 # ansible-config_template action plugin
 - name: config_template
-  src: git+https://git.openstack.org/openstack/ansible-config_template.git
+  src: https://opendev.org/openstack/ansible-config_template.git
   version: master

tests/ansible-role-requirements.yml

@@ -1,54 +1,54 @@
 ---
 - name: apt_package_pinning
-  src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
+  src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
   version: master
 - name: ceph_client
-  src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
+  src: https://opendev.org/openstack/openstack-ansible-ceph_client
   scm: git
   version: master
 - name: pip_install
-  src: https://git.openstack.org/openstack/openstack-ansible-pip_install
+  src: https://opendev.org/openstack/openstack-ansible-pip_install
   scm: git
   version: master
 - name: galera_client
-  src: https://git.openstack.org/openstack/openstack-ansible-galera_client
+  src: https://opendev.org/openstack/openstack-ansible-galera_client
   scm: git
   version: master
 - name: memcached_server
-  src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
+  src: https://opendev.org/openstack/openstack-ansible-memcached_server
   scm: git
   version: master
 - name: openstack_hosts
-  src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
+  src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
   scm: git
   version: master
 - name: lxc_hosts
-  src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
+  src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
   scm: git
   version: master
 - name: lxc_container_create
-  src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
+  src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
   scm: git
   version: master
 - name: galera_server
-  src: https://git.openstack.org/openstack/openstack-ansible-galera_server
+  src: https://opendev.org/openstack/openstack-ansible-galera_server
   scm: git
   version: master
 - name: rabbitmq_server
-  src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
+  src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
   scm: git
   version: master
 - name: openstack_openrc
-  src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
+  src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
   scm: git
   version: master
 - name: os_keystone
-  src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
+  src: https://opendev.org/openstack/openstack-ansible-os_keystone
   scm: git
   version: master
 - name: os_glance
-  src: https://git.openstack.org/openstack/openstack-ansible-os_glance
+  src: https://opendev.org/openstack/openstack-ansible-os_glance
   scm: git
   version: master
 - name: etcd # dependency of os_neutron role
@@ -56,11 +56,11 @@
   src: https://github.com/logan2211/ansible-etcd
   version: master
 - name: os_neutron
-  src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
+  src: https://opendev.org/openstack/openstack-ansible-os_neutron
   scm: git
   version: master
 - name: os_nova
-  src: https://git.openstack.org/openstack/openstack-ansible-os_nova
+  src: https://opendev.org/openstack/openstack-ansible-os_nova
   scm: git
   version: master
 - name: opendaylight
@@ -68,10 +68,10 @@
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
   version: master
 - name: systemd_service
-  src: https://git.openstack.org/openstack/ansible-role-systemd_service
+  src: https://opendev.org/openstack/ansible-role-systemd_service
   scm: git
   version: master
 - name: python_venv_build
-  src: https://git.openstack.org/openstack/ansible-role-python_venv_build
+  src: https://opendev.org/openstack/ansible-role-python_venv_build
   scm: git
   version: master

tests/os_tempest-overrides.yml

@@ -17,12 +17,12 @@
 tempest_run: yes
 
 # tempestconf specific settings
-tempest_tempestconf_git_repo: https://git.openstack.org/openstack/python-tempestconf
+tempest_tempestconf_git_repo: https://opendev.org/openstack/python-tempestconf
 
 # A sample plugin to activate the code path
 tempest_plugins:
   - name: sahara-tests
-    repo: https://git.openstack.org/openstack/sahara-tests
+    repo: https://opendev.org/openstack/sahara-tests
     branch: master
 
 neutron_provider_networks:

tox.ini

@@ -7,7 +7,7 @@ envlist = docs,linters,functional
 [testenv]
 usedevelop = True
 install_command =
-    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 commands =
     /usr/bin/find . -type f -name "*.pyc" -delete
 passenv =

vars/main.yml

@@ -53,101 +53,101 @@ tempest_images_map:
 _tempest_plugins:
   barbican:
     - name: barbican-tempest-plugin
-      repo: https://git.openstack.org/openstack/barbican-tempest-plugin
+      repo: https://opendev.org/openstack/barbican-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_barbican | bool }}"
   cinder:
     - name: cinder-tempest-plugin
-      repo: https://git.openstack.org/openstack/cinder-tempest-plugin
+      repo: https://opendev.org/openstack/cinder-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_cinder | bool }}"
   cloudkitty:
     - name: cloudkitty-tempest-plugin
-      repo: https://git.openstack.org/openstack/cloudkitty-tempest-plugin
+      repo: https://opendev.org/openstack/cloudkitty-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_cloudkitty | bool }}"
   congress:
     - name: congress-tempest-plugin
-      repo: https://git.openstack.org/openstack/congress-tempest-plugin
+      repo: https://opendev.org/openstack/congress-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_congress | bool }}"
   designate:
     - name: designate-tempest-plugin
-      repo: https://git.openstack.org/openstack/designate-tempest-plugin
+      repo: https://opendev.org/openstack/designate-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_designate | bool }}"
   heat:
     - name: heat-tempest-plugin
-      repo: https://git.openstack.org/openstack/heat-tempest-plugin
+      repo: https://opendev.org/openstack/heat-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_heat | bool }}"
   ironic:
     - name: ironic-tempest-plugin
-      repo: https://git.openstack.org/openstack/ironic-tempest-plugin
+      repo: https://opendev.org/openstack/ironic-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_ironic | bool }}"
   keystone:
     - name: keystone-tempest-plugin
-      repo: https://git.openstack.org/openstack/keystone-tempest-plugin
+      repo: https://opendev.org/openstack/keystone-tempest-plugin
       branch: master
       install: yes
   magnum:
     - name: magnum-tempest-plugin
-      repo: https://git.openstack.org/openstack/magnum-tempest-plugin
+      repo: https://opendev.org/openstack/magnum-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_magnum | bool }}"
   manila:
     - name: manila-tempest-plugin
-      repo: https://git.openstack.org/openstack/manila-tempest-plugin
+      repo: https://opendev.org/openstack/manila-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_manila | bool }}"
   networking-bgpvpn:
     - name: networking-bgpvpn
-      repo: https://git.openstack.org/openstack/networking-bgpvpn
+      repo: https://opendev.org/openstack/networking-bgpvpn
       branch: master
       install: "{{ tempest_service_available_neutron_bgpvpn | bool }}"
   neutron-fwaas:
     - name: neutron-fwaas
-      repo: https://git.openstack.org/openstack/neutron-fwaas
+      repo: https://opendev.org/openstack/neutron-fwaas
       branch: master
       install: "{{ tempest_service_available_neutron_fwaas | bool }}"
   neutron-vpnaas:
     - name: neutron-vpnaas
-      repo: https://git.openstack.org/openstack/neutron-vpnaas
+      repo: https://opendev.org/openstack/neutron-vpnaas
       branch: master
       install: "{{ tempest_service_available_neutron_vpnaas | bool }}"
   neutron:
     - name: neutron-tempest-plugin
-      repo: https://git.openstack.org/openstack/neutron-tempest-plugin
+      repo: https://opendev.org/openstack/neutron-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_neutron | bool }}"
   novajoin:
     - name: novajoin-tempest-plugin
-      repo: https://git.openstack.org/openstack/novajoin-tempest-plugin
+      repo: https://opendev.org/openstack/novajoin-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_novajoin | bool }}"
   nova-lxd:
     - name: nova-lxd
-      repo: https://git.openstack.org/openstack/nova-lxd
+      repo: https://opendev.org/x/nova-lxd
       branch: master
       install: "{{ tempest_service_available_nova_lxd | bool }}"
   octavia:
     - name: octavia-tempest-plugin
-      repo: https://git.openstack.org/openstack/octavia-tempest-plugin
+      repo: https://opendev.org/openstack/octavia-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_octavia | bool }}"
   sahara:
     - name: sahara-tests
-      repo: https://git.openstack.org/openstack/sahara-tests
+      repo: https://opendev.org/openstack/sahara-tests
       branch: master
       install: "{{ tempest_service_available_sahara | bool }}"
   telemetry:
     - name: telemetry-tempest-plugin
-      repo: https://git.openstack.org/openstack/telemetry-tempest-plugin
+      repo: https://opendev.org/openstack/telemetry-tempest-plugin
       branch: master
       install: "{{ (tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool) }}"
   zaqar:
     - name: zaqar-tempest-plugin
-      repo: https://git.openstack.org/openstack/zaqar-tempest-plugin
+      repo: https://opendev.org/openstack/zaqar-tempest-plugin
       branch: master
       install: "{{ tempest_service_available_zaqar | bool }}"