From: Sage Weil <sage@redhat.com>
Date: Fri, 18 Sep 2015 15:27:43 +0000 (-0400)
Subject: https for download.ceph.com
X-Git-Tag: v1.5.29~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F357%2Fhead;p=ceph-deploy.git

https for download.ceph.com

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index 503cc3d..260a71c 100644
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -67,12 +67,12 @@ def install(distro, version_kind, version, adjust_repos, **kw):
             distro.packager.add_repo_gpg_key(gpg.url(key))
 
             if version_kind == 'stable':
-                url = 'http://download.ceph.com/rpm-{version}/{repo}/'.format(
+                url = 'https://download.ceph.com/rpm-{version}/{repo}/'.format(
                     version=version,
                     repo=repo_part,
                     )
             elif version_kind == 'testing':
-                url = 'http://download.ceph.com/rpm-testing/{repo}/'.format(repo=repo_part)
+                url = 'https://download.ceph.com/rpm-testing/{repo}/'.format(repo=repo_part)
 
             remoto.process.run(
                 distro.conn,
diff --git a/ceph_deploy/hosts/debian/install.py b/ceph_deploy/hosts/debian/install.py
index 237cb98..faed95e 100644
--- a/ceph_deploy/hosts/debian/install.py
+++ b/ceph_deploy/hosts/debian/install.py
@@ -30,14 +30,18 @@ def install(distro, version_kind, version, adjust_repos, **kw):
         distro.packager.add_repo_gpg_key(gpg.url(key, protocol=protocol))
 
         if version_kind == 'stable':
-            url = 'http://download.ceph.com/debian-{version}/'.format(
+            url = '{protocol}://download.ceph.com/debian-{version}/'.format(
+                protocol=protocol,
                 version=version,
                 )
         elif version_kind == 'testing':
-            url = 'http://download.ceph.com/debian-testing/'
+            url = '{protocol}://download.ceph.com/debian-testing/'.format(
+                protocol=protocol,
+                )
         elif version_kind in ['dev', 'dev_commit']:
-            url = 'http://gitbuilder.ceph.com/ceph-deb-{codename}-{machine}-basic/{sub}/{version}'.format(
+            url = '{protocol}://gitbuilder.ceph.com/ceph-deb-{codename}-{machine}-basic/{sub}/{version}'.format(
                 codename=codename,
+                protocol=protocol,
                 machine=machine,
                 sub='ref' if version_kind == 'dev' else 'sha1',
                 version=version,
diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py
index e717475..11ce688 100644
--- a/ceph_deploy/hosts/fedora/install.py
+++ b/ceph_deploy/hosts/fedora/install.py
@@ -32,12 +32,12 @@ def install(distro, version_kind, version, adjust_repos, **kw):
             distro.packager.add_repo_gpg_key(gpg.url(key))
 
             if version_kind == 'stable':
-                url = 'http://download.ceph.com/rpm-{version}/fc{release}/'.format(
+                url = 'https://download.ceph.com/rpm-{version}/fc{release}/'.format(
                     version=version,
                     release=release,
                     )
             elif version_kind == 'testing':
-                url = 'http://download.ceph.com/rpm-testing/fc{release}'.format(
+                url = 'https://download.ceph.com/rpm-testing/fc{release}'.format(
                     release=release,
                     )