From: Dan Mick <dan.mick@inktank.com>
Date: Mon, 9 Jun 2014 23:20:40 +0000 (-0700)
Subject: Call custom_repo with reponame, not repo_name
X-Git-Tag: v1.5.5~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F198%2Fhead;p=ceph-deploy.git

Call custom_repo with reponame, not repo_name

Fixes: #8558
Signed-off-by: Dan Mick <dan.mick@inktank.com>
---

diff --git a/ceph_deploy/hosts/centos/install.py b/ceph_deploy/hosts/centos/install.py
index cb7c34e..d6f605e 100644
--- a/ceph_deploy/hosts/centos/install.py
+++ b/ceph_deploy/hosts/centos/install.py
@@ -183,9 +183,9 @@ def mirror_install(distro, repo_url, gpg_url, adjust_repos):
     pkg_managers.yum(distro.conn, 'ceph')
 
 
-def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
+def repo_install(distro, reponame, baseurl, gpgkey, **kw):
     # Get some defaults
-    name = kw.get('name', '%s repo' % repo_name)
+    name = kw.get('name', '%s repo' % reponame)
     enabled = kw.get('enabled', 1)
     gpgcheck = kw.get('gpgcheck', 1)
     install_ceph = kw.pop('install_ceph', False)
@@ -206,7 +206,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
         )
 
     repo_content = templates.custom_repo(
-        repo_name=repo_name,
+        reponame=reponame,
         name = name,
         baseurl = baseurl,
         enabled = enabled,
@@ -218,7 +218,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
 
     distro.conn.remote_module.write_yum_repo(
         repo_content,
-        "%s.repo" % repo_name
+        "%s.repo" % reponame
     )
 
     # Some custom repos do not need to install ceph
diff --git a/ceph_deploy/hosts/suse/install.py b/ceph_deploy/hosts/suse/install.py
index 517183f..030a5e1 100644
--- a/ceph_deploy/hosts/suse/install.py
+++ b/ceph_deploy/hosts/suse/install.py
@@ -117,9 +117,9 @@ def mirror_install(distro, repo_url, gpg_url, adjust_repos):
         )
 
 
-def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
+def repo_install(distro, reponame, baseurl, gpgkey, **kw):
     # Get some defaults
-    name = kw.get('name', '%s repo' % repo_name)
+    name = kw.get('name', '%s repo' % reponame)
     enabled = kw.get('enabled', 1)
     gpgcheck = kw.get('gpgcheck', 1)
     install_ceph = kw.pop('install_ceph', False)
@@ -138,7 +138,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
         )
 
     repo_content = templates.custom_repo(
-        repo_name=repo_name,
+        reponame=reponame,
         name = name,
         baseurl = baseurl,
         enabled = enabled,
@@ -150,7 +150,7 @@ def repo_install(distro, repo_name, baseurl, gpgkey, **kw):
 
     distro.conn.remote_module.write_yum_repo(
         repo_content,
-        "%s.repo" % repo_name
+        "%s.repo" % reponame
     )
 
     # Some custom repos do not need to install ceph