From 6c149596865e47c4d8854f383d654adf7ad55257 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Mon, 9 Jun 2014 16:20:40 -0700 Subject: [PATCH] Call custom_repo with reponame, not repo_name Fixes: #8558 Signed-off-by: Dan Mick --- ceph_deploy/hosts/centos/install.py | 8 ++++---- ceph_deploy/hosts/suse/install.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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 -- 2.47.3