From 007821e830957cc8a8a873e2706329da1481f07c Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Sun, 24 Mar 2019 20:36:20 +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: I7f2db9189611a1e2121d9e7bacd35c05382b5915
---
 .zuul.yaml                                   | 2 +-
 devstack/README.rst                          | 6 +++---
 integration/scripts/trovestack.rc            | 2 +-
 playbooks/legacy/grenade-dsvm-trove/run.yaml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 5097d5054b..9197b6a437 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -99,7 +99,7 @@
         tempest: true
         tls-proxy: false
       devstack_plugins:
-        trove: git://git.openstack.org/openstack/trove
+        trove: https://git.openstack.org/openstack/trove
       # NOTE(zhaochao): we have to override the default settings from the
       # the base devstack job about "SERVICE_HOST" and "HOST_IP", as trove
       # guestagent should use public addresses to access the underlying
diff --git a/devstack/README.rst b/devstack/README.rst
index c85d27f1b1..c044227d1d 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -17,7 +17,7 @@ Download DevStack
 .. sourcecode:: bash
 
     export DEVSTACK_DIR=~/devstack
-    git clone git://git.openstack.org/openstack-dev/devstack.git $DEVSTACK_DIR
+    git clone https://git.openstack.org/openstack-dev/devstack.git $DEVSTACK_DIR
 
 Enable the Trove plugin
 =======================
@@ -28,14 +28,14 @@ Enable the plugin by adding the following section to
 .. sourcecode:: bash
 
      [[local|localrc]]
-     enable_plugin trove git://git.openstack.org/openstack/trove
+     enable_plugin trove https://git.openstack.org/openstack/trove
 
 Optionally, a git refspec (branch or tag or commit) may be provided as follows:
 
 .. sourcecode:: bash
 
      [[local|localrc]]
-     enable_plugin trove git://git.openstack.org/openstack/trove <refspec>
+     enable_plugin trove https://git.openstack.org/openstack/trove <refspec>
 
 Run the DevStack utility
 ========================
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index 921e6b2693..ca83b77429 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -53,7 +53,7 @@ PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements
 # Save the state of TROVE_BRANCH first, since it's used in trovestack
 TROVE_BRANCH_ORIG=${TROVE_BRANCH}
 # Devstack and OpenStack git repo source paths, etc.
-GIT_BASE=${GIT_BASE:-git://git.openstack.org}
+GIT_BASE=${GIT_BASE:-https://git.openstack.org}
 GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack}
 DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git}
 TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git}
diff --git a/playbooks/legacy/grenade-dsvm-trove/run.yaml b/playbooks/legacy/grenade-dsvm-trove/run.yaml
index b37521b36b..11d7ef831e 100644
--- a/playbooks/legacy/grenade-dsvm-trove/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-trove/run.yaml
@@ -17,7 +17,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'