diff --git a/hooks/charmhelpers/contrib/openstack/utils.py b/hooks/charmhelpers/contrib/openstack/utils.py index c138193d..67f4e4ab 100644 --- a/hooks/charmhelpers/contrib/openstack/utils.py +++ b/hooks/charmhelpers/contrib/openstack/utils.py @@ -874,10 +874,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 a28a50fc..35b18ece 100644 --- a/unit_tests/test_neutron_api_hooks.py +++ b/unit_tests/test_neutron_api_hooks.py @@ -197,10 +197,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', @@ -285,10 +285,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 8d045c69..5b82f0a4 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}"""