From: Alfredo Deza Date: Thu, 17 Apr 2014 20:15:42 +0000 (-0400) Subject: make fedora reuse more centos install stuff X-Git-Tag: v1.5.0~10^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c4e8b502f2e9ad84dd2065e0a06bfdc68f304dc;p=ceph-deploy.git make fedora reuse more centos install stuff Signed-off-by: Alfredo Deza --- diff --git a/ceph_deploy/hosts/fedora/install.py b/ceph_deploy/hosts/fedora/install.py index 00ee141..5c9efe6 100644 --- a/ceph_deploy/hosts/fedora/install.py +++ b/ceph_deploy/hosts/fedora/install.py @@ -1,6 +1,6 @@ from ceph_deploy.util import pkg_managers, templates from ceph_deploy.lib.remoto import process -from ceph_deploy.hosts.centos.install import repo_install +from ceph_deploy.hosts.centos.install import repo_install, mirror_install # noqa def install(distro, version_kind, version, adjust_repos): @@ -63,26 +63,3 @@ def install(distro, version_kind, version, adjust_repos): 'ceph', ], ) - - -def mirror_install(distro, repo_url, gpg_url, adjust_repos): - repo_url = repo_url.strip('/') # Remove trailing slashes - - if adjust_repos: - process.run( - distro.conn, - [ - 'rpm', - '--import', - gpg_url, - ] - ) - - ceph_repo_content = templates.ceph_repo.format( - repo_url=repo_url, - gpg_url=gpg_url - ) - - distro.conn.remote_module.write_yum_repo(ceph_repo_content) - - pkg_managers.yum(distro.conn, 'ceph')