Merge "Replace openstack.org git:// URLs with https://" into stable/stein

7 files changed, 12 insertions, 12 deletions

diff --git a/doc/source/contributor/dev-quickstart.rst b/doc/source/contributor/dev-quickstart.rst
index 05b8faacf..d8285b787 100644
--- a/doc/source/contributor/dev-quickstart.rst
+++ b/doc/source/contributor/dev-quickstart.rst
@@ -464,7 +464,7 @@ hardware type by default::
     SWIFT_TEMPURL_KEY=password
 
     # Enable Ironic plugin
-    enable_plugin ironic git://git.openstack.org/openstack/ironic
+    enable_plugin ironic https://git.openstack.org/openstack/ironic
 
     # Disable nova novnc service, ironic does not support it anyway.
     disable_service n-novnc
@@ -560,7 +560,7 @@ hardware type by default::
 .. note::
     To check out an in-progress patch for testing, you can add a Git ref to the ``enable_plugin`` line. For instance::
 
-      enable_plugin ironic git://git.openstack.org/openstack/ironic refs/changes/46/295946/15
+      enable_plugin ironic https://git.openstack.org/openstack/ironic refs/changes/46/295946/15
 
     For a patch in review, you can find the ref to use by clicking the
     "Download" button in Gerrit. You can also specify a different git repo, or
diff --git a/doc/source/contributor/ironic-boot-from-volume.rst b/doc/source/contributor/ironic-boot-from-volume.rst
index abdb79619..72991737d 100644
--- a/doc/source/contributor/ironic-boot-from-volume.rst
+++ b/doc/source/contributor/ironic-boot-from-volume.rst
@@ -20,7 +20,7 @@ description for DevStack is at :ref:`deploy_devstack`.
 
     [[local|localrc]]
 
-    enable_plugin ironic git://git.openstack.org/openstack/ironic
+    enable_plugin ironic https://git.openstack.org/openstack/ironic
 
     IRONIC_STORAGE_INTERFACE=cinder
 
diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
index 8e13f99fe..47779d4e8 100644
--- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
@@ -74,7 +74,7 @@
             # networking-generic-switch requires sudo to execute ovs-vsctl commands
             export DEVSTACK_GATE_REMOVE_STACK_SUDO=0
             export PROJECTS="openstack/networking-generic-switch $PROJECTS"
-            export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch git://git.openstack.org/openstack/networking-generic-switch"
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-generic-switch https://git.openstack.org/openstack/networking-generic-switch"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_USE_LINK_LOCAL=True"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_BRIDGE_MAPPINGS=mynetwork:brbm,public:br_ironic_vxlan"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"OVS_PHYSICAL_BRIDGE=brbm"
@@ -155,7 +155,7 @@
           # Pull in the EARLY variables injected by the optional builders
           source ironic-vars-early
 
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic https://git.openstack.org/openstack/ironic"
 
           # Ensure the ironic-EXTRA-vars file exists
           touch ironic-extra-vars
diff --git a/playbooks/legacy/grenade-dsvm-ironic/run.yaml b/playbooks/legacy/grenade-dsvm-ironic/run.yaml
index 6f802bcd2..6fdf5a100 100644
--- a/playbooks/legacy/grenade-dsvm-ironic/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-ironic/run.yaml
@@ -102,7 +102,7 @@
           # Pull in the EARLY variables injected by the optional builders
           source ironic-vars-early
 
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic https://git.openstack.org/openstack/ironic"
 
           # Ensure the ironic-EXTRA-vars file exists
           touch ironic-extra-vars
diff --git a/playbooks/legacy/ironic-dsvm-base-multinode/pre.yaml b/playbooks/legacy/ironic-dsvm-base-multinode/pre.yaml
index 2f347adb4..50fc638ff 100644
--- a/playbooks/legacy/ironic-dsvm-base-multinode/pre.yaml
+++ b/playbooks/legacy/ironic-dsvm-base-multinode/pre.yaml
@@ -15,7 +15,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'
diff --git a/playbooks/legacy/ironic-dsvm-base/pre.yaml b/playbooks/legacy/ironic-dsvm-base/pre.yaml
index 2f347adb4..50fc638ff 100644
--- a/playbooks/legacy/ironic-dsvm-base/pre.yaml
+++ b/playbooks/legacy/ironic-dsvm-base/pre.yaml
@@ -15,7 +15,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'
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index b719b2450..89df3d52c 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -52,7 +52,7 @@
         Q_AGENT: openvswitch
         Q_ML2_TENANT_NETWORK_TYPE: vxlan
       devstack_plugins:
-        ironic: git://git.openstack.org/openstack/ironic
+        ironic: https://git.openstack.org/openstack/ironic
       zuul_copy_output:
         '{{ devstack_base_dir }}/ironic-bm-logs': 'logs'
       devstack_services:
@@ -228,7 +228,7 @@
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
       devstack_plugins:
-        ironic-inspector: git://git.openstack.org/openstack/ironic-inspector
+        ironic-inspector: https://git.openstack.org/openstack/ironic-inspector
       devstack_services:
         s-account: True
         s-container: True
@@ -378,8 +378,8 @@
         TENANT_VLAN_RANGE: 100:150
         VIRT_DRIVER: ironic
       devstack_plugins:
-        ironic: git://git.openstack.org/openstack/ironic
-        networking-generic-switch: git://git.openstack.org/openstack/networking-generic-switch
+        ironic: https://git.openstack.org/openstack/ironic
+        networking-generic-switch: https://git.openstack.org/openstack/networking-generic-switch
       zuul_copy_output:
         '{{ devstack_base_dir }}/ironic-bm-logs': 'logs'
       devstack_services: