From c23c94afe9be0078a1c6114bd927d7f87cd0e2c7 Mon Sep 17 00:00:00 2001
From: Ben Brown <benjamb@pm.me>
Date: Wed, 19 Aug 2020 19:59:20 +0100
Subject: Update OpenStack urls

While updating the generate-openstack.lorry.py script would likely be
best for ongoing mirroring of the relevant OpenStack repositories, for
now simply `sed`ing is easier.

Updated a few paths via checking redirection warnings from
`git ls-remote`.

Closes #13.
---
 open-source-lorries/git-review.lorry       |   2 +-
 open-source-lorries/openstack.lorry        | 122 ++++++++++++++---------------
 open-source-lorries/python-packages.lorry  |   6 +-
 open-source-lorries/xstatic-packages.lorry |  48 ++++++------
 4 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/open-source-lorries/git-review.lorry b/open-source-lorries/git-review.lorry
index 6329687..e71a00b 100644
--- a/open-source-lorries/git-review.lorry
+++ b/open-source-lorries/git-review.lorry
@@ -1,6 +1,6 @@
 {
     "git-review": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack-infra/git-review"
+        "url": "https://opendev.org/opendev/git-review"
     }
 }
diff --git a/open-source-lorries/openstack.lorry b/open-source-lorries/openstack.lorry
index 41bddd0..94cf372 100644
--- a/open-source-lorries/openstack.lorry
+++ b/open-source-lorries/openstack.lorry
@@ -1,97 +1,97 @@
 {
     "openstack/nova": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/nova.git"
+        "url": "https://opendev.org/openstack/nova.git"
     },
 
     "openstack/python-novaclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-novaclient.git"
+        "url": "https://opendev.org/openstack/python-novaclient.git"
     },
 
     "openstack/swift": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/swift.git"
+        "url": "https://opendev.org/openstack/swift.git"
     },
 
     "openstack/python-swiftclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-swiftclient.git"
+        "url": "https://opendev.org/openstack/python-swiftclient.git"
     },
 
     "openstack/swift-bench": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/swift-bench.git"
+        "url": "https://opendev.org/openstack/swift-bench.git"
     },
 
     "openstack/glance": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/glance.git"
+        "url": "https://opendev.org/openstack/glance.git"
     },
 
     "openstack/python-glanceclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-glanceclient.git"
+        "url": "https://opendev.org/openstack/python-glanceclient.git"
     },
 
     "openstack/glance_store": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/glance_store.git"
+        "url": "https://opendev.org/openstack/glance_store.git"
     },
 
     "openstack/keystone": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/keystone.git"
+        "url": "https://opendev.org/openstack/keystone.git"
     },
 
     "openstack/python-keystoneclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-keystoneclient.git"
+        "url": "https://opendev.org/openstack/python-keystoneclient.git"
     },
 
     "openstack/keystonemiddleware": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/keystonemiddleware.git"
+        "url": "https://opendev.org/openstack/keystonemiddleware.git"
     },
 
     "openstack/horizon": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/horizon.git"
+        "url": "https://opendev.org/openstack/horizon.git"
     },
 
     "openstack/django_openstack_auth": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/django_openstack_auth.git"
+        "url": "https://opendev.org/openstack/django_openstack_auth.git"
     },
 
     "openstack/tuskar-ui": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/tuskar-ui.git"
+        "url": "https://opendev.org/x/tuskar-ui.git"
     },
 
     "openstack/neutron": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/neutron.git"
+        "url": "https://opendev.org/openstack/neutron.git"
     },
 
     "openstack/python-neutronclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-neutronclient.git"
+        "url": "https://opendev.org/openstack/python-neutronclient.git"
     },
 
     "openstack/cinder": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/cinder.git"
+        "url": "https://opendev.org/openstack/cinder.git"
     },
 
     "openstack/python-cinderclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-cinderclient.git"
+        "url": "https://opendev.org/openstack/python-cinderclient.git"
     },
 
     "openstack/ceilometer": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/ceilometer.git"
+        "url": "https://opendev.org/openstack/ceilometer.git"
     },
 
     "openstack/ceilometermiddleware": {
@@ -101,189 +101,189 @@
 
     "openstack/python-ceilometerclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-ceilometerclient.git"
+        "url": "https://opendev.org/openstack/python-ceilometerclient.git"
     },
 
     "openstack/heat": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/heat.git"
+        "url": "https://opendev.org/openstack/heat.git"
     },
 
     "openstack/python-heatclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-heatclient.git"
+        "url": "https://opendev.org/openstack/python-heatclient.git"
     },
 
     "openstack/heat-cfntools": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/heat-cfntools.git"
+        "url": "https://opendev.org/openstack/heat-cfntools.git"
     },
 
     "openstack/heat-templates": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/heat-templates.git"
+        "url": "https://opendev.org/openstack/heat-templates.git"
     },
 
     "openstack/trove": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/trove.git"
+        "url": "https://opendev.org/openstack/trove.git"
     },
 
     "openstack/python-troveclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-troveclient.git"
+        "url": "https://opendev.org/openstack/python-troveclient.git"
     },
 
     "openstack/trove-integration": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/trove-integration.git"
+        "url": "https://opendev.org/openstack/trove-integration.git"
     },
 
     "openstack/ironic": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/ironic.git"
+        "url": "https://opendev.org/openstack/ironic.git"
     },
 
     "openstack/python-ironicclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-ironicclient.git"
+        "url": "https://opendev.org/openstack/python-ironicclient.git"
     },
 
     "openstack/ironic-python-agent": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/ironic-python-agent.git"
+        "url": "https://opendev.org/openstack/ironic-python-agent.git"
     },
 
     "openstack/cliff": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/cliff.git"
+        "url": "https://opendev.org/openstack/cliff.git"
     },
 
     "openstack/oslo-config": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.config.git"
+        "url": "https://opendev.org/openstack/oslo.config.git"
     },
 
     "openstack/oslo-concurrency": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.concurrency"
+        "url": "https://opendev.org/openstack/oslo.concurrency"
     },
 
     "openstack/oslo-context": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.context"
+        "url": "https://opendev.org/openstack/oslo.context"
     },
 
     "openstack/oslo-db": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.db.git"
+        "url": "https://opendev.org/openstack/oslo.db.git"
     },
 
     "openstack/oslo-i18n": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.i18n.git"
+        "url": "https://opendev.org/openstack/oslo.i18n.git"
     },
 
     "openstack/oslo-incubator": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo-incubator.git"
+        "url": "https://opendev.org/openstack/oslo-incubator.git"
     },
 
     "openstack/oslo-log": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.log"
+        "url": "https://opendev.org/openstack/oslo.log"
     },
 
     "openstack/oslo-messaging": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.messaging.git"
+        "url": "https://opendev.org/openstack/oslo.messaging.git"
     },
 
     "openstack/oslo-middleware": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.middleware"
+        "url": "https://opendev.org/openstack/oslo.middleware"
     },
 
     "openstack/oslo-policy": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.policy"
+        "url": "https://opendev.org/openstack/oslo.policy"
     },
 
     "openstack/oslo-rootwrap": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.rootwrap.git"
+        "url": "https://opendev.org/openstack/oslo.rootwrap.git"
     },
 
     "openstack/oslo-serialization": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.serialization.git"
+        "url": "https://opendev.org/openstack/oslo.serialization.git"
     },
 
     "openstack/oslosphinx": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslosphinx.git"
+        "url": "https://opendev.org/openstack/oslosphinx.git"
     },
 
     "openstack/oslotest": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslotest.git"
+        "url": "https://opendev.org/openstack/oslotest.git"
     },
 
     "openstack/oslo-version": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.version.git"
+        "url": "https://opendev.org/openstack-attic/oslo.version.git"
     },
 
     "openstack/oslo-vmware": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.vmware.git"
+        "url": "https://opendev.org/openstack/oslo.vmware.git"
     },
 
     "openstack/oslo-utils": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/oslo.utils.git"
+        "url": "https://opendev.org/openstack/oslo.utils.git"
     },
 
     "openstack/pycadf": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/pycadf.git"
+        "url": "https://opendev.org/openstack/pycadf.git"
     },
 
     "openstack/stevedore": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/stevedore.git"
+        "url": "https://opendev.org/openstack/stevedore.git"
     },
 
     "openstack/taskflow": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/taskflow.git"
+        "url": "https://opendev.org/openstack/taskflow.git"
     },
 
     "openstack/designate": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/designate.git"
+        "url": "https://opendev.org/openstack/designate.git"
     },
 
     "openstack/python-designateclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-designateclient.git"
+        "url": "https://opendev.org/openstack/python-designateclient.git"
     },
 
     "openstack/python-barbicanclient": {
          "type": "git",
-         "url": "git://git.openstack.org/openstack/python-barbicanclient.git"
+         "url": "https://opendev.org/openstack/python-barbicanclient.git"
     },
     "openstack/zuul": {
          "type": "git",
-         "url": "git://git.openstack.org/openstack-infra/zuul.git"
+         "url": "https://opendev.org/zuul/zuul.git"
     },
     "openstack/turbo-hipster": {
         "type": "git",
-        "url": "git://git.openstack.org/stackforge/turbo-hipster.git"
+        "url": "https://opendev.org/x/turbo-hipster.git"
     },
     "openstack/python-saharaclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-saharaclient"
+        "url": "https://opendev.org/openstack/python-saharaclient"
     },
     "openstack/openstack-ansible-modules": {
         "type": "git",
@@ -291,18 +291,18 @@
     },
    "openstack/tempest-lib": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/tempest-lib"
+        "url": "https://opendev.org/openstack/tempest-lib"
    },
    "openstack/tempest": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/tempest"
+        "url": "https://opendev.org/openstack/tempest"
    },
    "openstack/python-openstackclient": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/python-openstackclient"
+        "url": "https://opendev.org/openstack/python-openstackclient"
    },
    "openstack/os-client-config": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/os-client-config.git"
+        "url": "https://opendev.org/openstack/os-client-config.git"
    }
 }
diff --git a/open-source-lorries/python-packages.lorry b/open-source-lorries/python-packages.lorry
index 154a87a..a61765e 100644
--- a/open-source-lorries/python-packages.lorry
+++ b/open-source-lorries/python-packages.lorry
@@ -146,7 +146,7 @@
     },
     "python-packages/gear": {
         "type": "git",
-        "url": "https://git.openstack.org/openstack-infra/gear"
+        "url": "https://opendev.org/opendev/gear"
     },
     "python-packages/gitdb": {
         "type": "git",
@@ -214,7 +214,7 @@
     },
     "python-packages/lockfile": {
         "type": "git",
-        "url": "https://git.openstack.org/openstack/pylockfile"
+        "url": "https://opendev.org/openstack/pylockfile"
     },
     "python-packages/logilab-common": {
         "type": "hg",
@@ -624,7 +624,7 @@
     },
     "python-packages/tooz": {
         "type": "git",
-        "url": "git://git.openstack.org/openstack/tooz.git"
+        "url": "https://opendev.org/openstack/tooz.git"
     },
     "python-packages/tox": {
         "type": "hg",
diff --git a/open-source-lorries/xstatic-packages.lorry b/open-source-lorries/xstatic-packages.lorry
index 455046f..48f55f5 100644
--- a/open-source-lorries/xstatic-packages.lorry
+++ b/open-source-lorries/xstatic-packages.lorry
@@ -1,67 +1,67 @@
 {
     "xstatic-packages/xstatic-angular": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular"
+        "url": "https://opendev.org/openstack/xstatic-angular"
     },
     "xstatic-packages/xstatic-angular-animate": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-animate"
+        "url": "https://opendev.org/stackforge/xstatic-angular-animate"
     },
     "xstatic-packages/xstatic-angular-bootstrap": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-bootstrap"
+        "url": "https://opendev.org/openstack/xstatic-angular-bootstrap"
     },
     "xstatic-packages/xstatic-angular-cookies": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-cookies"
+        "url": "https://opendev.org/x/xstatic-angular-cookies"
     },
     "xstatic-packages/xstatic-angular-fileupload": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-fileupload"
+        "url": "https://opendev.org/x/xstatic-angular-fileupload"
     },
     "xstatic-packages/xstatic-angular-lrdragndrop": {
         "type": "git",
-        "url": "git://git.openstack.org/stackforge/xstatic-angular-lrdragndrop"
+        "url": "https://opendev.org/openstack/xstatic-angular-lrdragndrop"
     },
     "xstatic-packages/xstatic-magic-search": {
         "type": "git",
-        "url": "git://git.openstack.org/stackforge/xstatic-magic-search"
+        "url": "https://opendev.org/openstack/xstatic-magic-search"
     },
     "xstatic-packages/xstatic-angular-mock": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-mock"
+        "url": "https://opendev.org/x/xstatic-angular-mock"
     },
     "xstatic-packages/xstatic-angular-sanitize": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-sanitize"
+        "url": "https://opendev.org/x/xstatic-angular-sanitize"
     },
     "xstatic-packages/xstatic-angular-smart-table": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-angular-smart-table"
+        "url": "https://opendev.org/openstack/xstatic-angular-smart-table"
     },
     "xstatic-packages/xstatic-bootstrap-datepicker": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-bootstrap-datepicker"
+        "url": "https://opendev.org/openstack/xstatic-bootstrap-datepicker"
     },
     "xstatic-packages/xstatic-bootstrap-scss": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-bootstrap-scss"
+        "url": "https://opendev.org/openstack/xstatic-bootstrap-scss"
     },
     "xstatic-packages/xstatic-d3": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-d3"
+        "url": "https://opendev.org/openstack/xstatic-d3"
     },
     "xstatic-packages/xstatic-font-awesome": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-font-awesome"
+        "url": "https://opendev.org/openstack/xstatic-font-awesome"
     },
     "xstatic-packages/xstatic-hogan": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-hogan"
+        "url": "https://opendev.org/openstack/xstatic-hogan"
     },
     "xstatic-packages/xstatic-jasmine": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-jasmine"
+        "url": "https://opendev.org/openstack/xstatic-jasmine"
     },
     "xstatic-packages/xstatic-jquery": {
         "type": "hg",
@@ -69,19 +69,19 @@
     },
     "xstatic-packages/xstatic-jquery-bootstrap-wizard": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-jquery.bootstrap.wizard"
+        "url": "https://opendev.org/x/xstatic-jquery.bootstrap.wizard"
     },
     "xstatic-packages/xstatic-jquery-migrate": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-jquery-migrate"
+        "url": "https://opendev.org/openstack/xstatic-jquery-migrate"
     },
     "xstatic-packages/xstatic-jquery-quicksearch": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-jquery.quicksearch"
+        "url": "https://opendev.org/openstack/xstatic-jquery.quicksearch"
     },
     "xstatic-packages/xstatic-jquery-tablesorter": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-jquery.tablesorter"
+        "url": "https://opendev.org/openstack/xstatic-jquery.tablesorter"
     },
     "xstatic-packages/xstatic-jquery-ui": {
         "type": "hg",
@@ -89,19 +89,19 @@
     },
     "xstatic-packages/xstatic-jsencrypt": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-jsencrypt"
+        "url": "https://opendev.org/openstack/xstatic-jsencrypt"
     },
     "xstatic-packages/xstatic-qunit": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-qunit"
+        "url": "https://opendev.org/x/xstatic-qunit"
     },
     "xstatic-packages/xstatic-rickshaw": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-rickshaw"
+        "url": "https://opendev.org/openstack/xstatic-rickshaw"
     },
     "xstatic-packages/xstatic-spin": {
         "type": "git",
-        "url": "https://git.openstack.org/stackforge/xstatic-spin"
+        "url": "https://opendev.org/openstack/xstatic-spin"
     },
     "xstatic-packages/xstatic-termjs": {
         "type": "git",
-- 
cgit v1.2.1