From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Wed, 4 Jun 2014 20:42:31 +0000 (-0400)
Subject: make suse use the new custom_repo callable
X-Git-Tag: v1.5.4~4^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73252d72545994b33a82ab4e494a012f62b36e03;p=ceph-deploy.git

make suse use the new custom_repo callable

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/hosts/suse/install.py b/ceph_deploy/hosts/suse/install.py
index fd87509..517183f 100644
--- a/ceph_deploy/hosts/suse/install.py
+++ b/ceph_deploy/hosts/suse/install.py
@@ -123,6 +123,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')
     _type = 'repo-md'
     baseurl = baseurl.strip('/')  # Remove trailing slashes
 
@@ -136,7 +137,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,
@@ -144,6 +145,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
         gpgcheck = gpgcheck,
         _type = _type,
         gpgkey = gpgkey,
+        proxy = proxy,
     )
 
     distro.conn.remote_module.write_yum_repo(