From 8b19403006f221e4a108a4814282c47318c66b25 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Sun, 24 Mar 2019 20:33:01 +0000
Subject: [PATCH] Replace openstack.org git:// URLs with https://

This is a mechanically generated change to replace openstack.org
git:// URLs with https:// equivalents.

This is in aid of a planned future move of the git hosting
infrastructure to a self-hosted instance of gitea (https://gitea.io),
which does not support the git wire protocol at this stage.

This update should result in no functional change.

For more information see the thread at

 http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html

Change-Id: I0d8ac8114d5aabd1b1e6870aa8edffdf0b0a6f2e
---
 hooks/charmhelpers/contrib/openstack/utils.py | 4 ++--
 unit_tests/test_actions_git_reinstall.py      | 4 ++--
 unit_tests/test_neutron_api_hooks.py          | 8 ++++----
 unit_tests/test_neutron_api_utils.py          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py
index 837a1674..c07c474e 100644
--- a/hooks/charmhelpers/contrib/openstack/utils.py
+++ b/hooks/charmhelpers/contrib/openstack/utils.py
@@ -870,10 +870,10 @@ def git_clone_and_install(projects_yaml, core_project):
 
         repositories:
           - {name: keystone,
-             repository: 'git://git.openstack.org/openstack/keystone.git',
+             repository: 'https://git.openstack.org/openstack/keystone.git',
              branch: 'stable/icehouse'}
           - {name: requirements,
-             repository: 'git://git.openstack.org/openstack/requirements.git',
+             repository: 'https://git.openstack.org/openstack/requirements.git',
              branch: 'stable/icehouse'}
 
         directory: /mnt/openstack-git
diff --git a/unit_tests/test_actions_git_reinstall.py b/unit_tests/test_actions_git_reinstall.py
index 231cfec7..76ba3b22 100644
--- a/unit_tests/test_actions_git_reinstall.py
+++ b/unit_tests/test_actions_git_reinstall.py
@@ -53,10 +53,10 @@ TO_PATCH = [
 openstack_origin_git = \
     """repositories:
          - {name: requirements,
-            repository: 'git://git.openstack.org/openstack/requirements',
+            repository: 'https://git.openstack.org/openstack/requirements',
             branch: stable/juno}
          - {name: neutron,
-            repository: 'git://git.openstack.org/openstack/neutron',
+            repository: 'https://git.openstack.org/openstack/neutron',
             branch: stable/juno}"""
 
 
diff --git a/unit_tests/test_neutron_api_hooks.py b/unit_tests/test_neutron_api_hooks.py
index a8b61ed0..6c152a83 100644
--- a/unit_tests/test_neutron_api_hooks.py
+++ b/unit_tests/test_neutron_api_hooks.py
@@ -195,10 +195,10 @@ class NeutronAPIHooksTests(CharmTestCase):
         openstack_origin_git = {
             'repositories': [
                 {'name': 'requirements',
-                 'repository': 'git://git.openstack.org/openstack/requirements',  # noqa
+                 'repository': 'https://git.openstack.org/openstack/requirements',  # noqa
                  'branch': 'stable/juno'},
                 {'name': 'neutron',
-                 'repository': 'git://git.openstack.org/openstack/neutron',
+                 'repository': 'https://git.openstack.org/openstack/neutron',
                  'branch': 'stable/juno'}
             ],
             'directory': '/mnt/openstack-git',
@@ -289,10 +289,10 @@ class NeutronAPIHooksTests(CharmTestCase):
             'repositories': [
                 {'name': 'requirements',
                  'repository':
-                 'git://git.openstack.org/openstack/requirements',
+                 'https://git.openstack.org/openstack/requirements',
                  'branch': 'stable/juno'},
                 {'name': 'neutron',
-                 'repository': 'git://git.openstack.org/openstack/neutron',
+                 'repository': 'https://git.openstack.org/openstack/neutron',
                  'branch': 'stable/juno'}
             ],
             'directory': '/mnt/openstack-git',
diff --git a/unit_tests/test_neutron_api_utils.py b/unit_tests/test_neutron_api_utils.py
index 6285596c..b910c5c4 100644
--- a/unit_tests/test_neutron_api_utils.py
+++ b/unit_tests/test_neutron_api_utils.py
@@ -62,10 +62,10 @@ TO_PATCH = [
 openstack_origin_git = \
     """repositories:
          - {name: requirements,
-            repository: 'git://git.openstack.org/openstack/requirements',
+            repository: 'https://git.openstack.org/openstack/requirements',
             branch: stable/juno}
          - {name: neutron,
-            repository: 'git://git.openstack.org/openstack/neutron',
+            repository: 'https://git.openstack.org/openstack/neutron',
             branch: stable/juno}"""