From: Alfredo Deza Date: Wed, 4 Jun 2014 20:42:08 +0000 (-0400) Subject: make centos use the new custom_repo X-Git-Tag: v1.5.4~4^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=46bbe32f563df6fa01badf824aef5e9db9b94f2d;p=ceph-deploy.git make centos use the new custom_repo Signed-off-by: Alfredo Deza --- diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py index 1df733a..3fce37c 100644 --- a/ceph_deploy/hosts/centos/install.py +++ b/ceph_deploy/hosts/centos/install.py @@ -155,7 +155,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw): enabled = kw.get('enabled', 1) gpgcheck = kw.get('gpgcheck', 1) install_ceph = kw.pop('install_ceph', False) - proxy = kw.get('proxy', '') + proxy = kw.get('proxy') _type = 'repo-md' baseurl = baseurl.strip('/') # Remove trailing slashes @@ -171,7 +171,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw): ] ) - repo_content = templates.custom_repo.format( + repo_content = templates.custom_repo( repo_name=repo_name, name = name, baseurl = baseurl,