From 8b003e0ed2f41fb1ab0007c969bba33c5701f625 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 4 Mar 2019 16:50:42 +1100 Subject: [PATCH] Switch GIT_BASE to https:// Infra are looking at implementing gitea for serving git, but this does not have a git protocol handler ATM. Switch GIT_BASE, and some testing, to https:// to be in a better position to handle this. Change-Id: I97a7b0de7b1ec2dd15d15c58699a631b09273df1 Story: #2004627 Task: #29701 --- roles/write-devstack-local-conf/library/test.py | 14 +++++++------- stackrc | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/roles/write-devstack-local-conf/library/test.py b/roles/write-devstack-local-conf/library/test.py index 88d404b856..45fae3da28 100644 --- a/roles/write-devstack-local-conf/library/test.py +++ b/roles/write-devstack-local-conf/library/test.py @@ -40,9 +40,9 @@ class TestDevstackLocalConf(unittest.TestCase): # We use ordereddict here to make sure the plugins are in the # *wrong* order for testing. plugins = OrderedDict([ - ('bar', 'git://git.openstack.org/openstack/bar-plugin'), - ('foo', 'git://git.openstack.org/openstack/foo-plugin'), - ('baz', 'git://git.openstack.org/openstack/baz-plugin'), + ('bar', 'https://git.openstack.org/openstack/bar-plugin'), + ('foo', 'https://git.openstack.org/openstack/foo-plugin'), + ('baz', 'https://git.openstack.org/openstack/baz-plugin'), ]) p = dict(localrc=localrc, local_conf=local_conf, @@ -94,8 +94,8 @@ class TestDevstackLocalConf(unittest.TestCase): # We use ordereddict here to make sure the plugins are in the # *wrong* order for testing. plugins = OrderedDict([ - ('bar-plugin', 'git://git.openstack.org/openstack/bar-plugin'), - ('foo-plugin', 'git://git.openstack.org/openstack/foo-plugin'), + ('bar-plugin', 'https://git.openstack.org/openstack/bar-plugin'), + ('foo-plugin', 'https://git.openstack.org/openstack/foo-plugin'), ]) p = dict(localrc=localrc, local_conf=local_conf, @@ -227,8 +227,8 @@ class TestDevstackLocalConf(unittest.TestCase): # We use ordereddict here to make sure the plugins are in the # *wrong* order for testing. plugins = OrderedDict([ - ('bar', 'git://git.openstack.org/openstack/bar-plugin'), - ('foo', 'git://git.openstack.org/openstack/foo-plugin'), + ('bar', 'https://git.openstack.org/openstack/bar-plugin'), + ('foo', 'https://git.openstack.org/openstack/foo-plugin'), ]) p = dict(localrc=localrc, local_conf=local_conf, diff --git a/stackrc b/stackrc index 53868f3d9d..652f2de0d5 100644 --- a/stackrc +++ b/stackrc @@ -237,8 +237,7 @@ WSGI_MODE=${WSGI_MODE:-"uwsgi"} # ------------ # Base GIT Repo URL -# Another option is https://git.openstack.org -GIT_BASE=${GIT_BASE:-git://git.openstack.org} +GIT_BASE=${GIT_BASE:-https://git.openstack.org} # The location of REQUIREMENTS once cloned REQUIREMENTS_DIR=$DEST/requirements