Revision 0390e377
[RM-12439] suse: Use Zypper Class pkg manager
Refs: #12439
Signed-off-by: Travis Rhoden <trhoden@redhat.com>
ceph_deploy/hosts/__init__.py | ||
---|---|---|
69 | 69 |
module.conn = conn |
70 | 70 |
module.machine_type = machine_type |
71 | 71 |
module.init = module.choose_init() |
72 |
if module.normalized_name in ['fedora', 'centos', 'redhat', |
|
73 |
'ubuntu', 'debian']: |
|
74 |
module.packager = module.get_packager(module) |
|
72 |
module.packager = module.get_packager(module) |
|
75 | 73 |
return module |
76 | 74 |
|
77 | 75 |
|
ceph_deploy/hosts/suse/__init__.py | ||
---|---|---|
4 | 4 |
from uninstall import uninstall # noqa |
5 | 5 |
import logging |
6 | 6 |
|
7 |
from ceph_deploy.util import pkg_managers |
|
8 |
|
|
7 | 9 |
# Allow to set some information about this distro |
8 | 10 |
# |
9 | 11 |
|
... | ... | |
24 | 26 |
'13.1' : 'systemd', # openSUSE_13.1 |
25 | 27 |
} |
26 | 28 |
return init_mapping.get(release, 'sysvinit') |
29 |
|
|
30 |
|
|
31 |
def get_packager(module): |
|
32 |
return pkg_managers.Zypper(module) |
ceph_deploy/hosts/suse/install.py | ||
---|---|---|
1 | 1 |
import logging |
2 | 2 |
|
3 |
from ceph_deploy.util import templates, pkg_managers
|
|
3 |
from ceph_deploy.util import templates |
|
4 | 4 |
from ceph_deploy.lib import remoto |
5 | 5 |
from ceph_deploy.hosts.common import map_components |
6 | 6 |
|
... | ... | |
15 | 15 |
kw.get('components', []) |
16 | 16 |
) |
17 | 17 |
|
18 |
pkg_managers.zypper_refresh(distro.conn)
|
|
19 |
if len(packages):
|
|
20 |
pkg_managers.zypper(distro.conn, packages)
|
|
18 |
distro.packager.clean()
|
|
19 |
if packages:
|
|
20 |
distro.packager.install(packages)
|
|
21 | 21 |
|
22 | 22 |
|
23 | 23 |
def mirror_install(distro, repo_url, gpg_url, adjust_repos, **kw): |
... | ... | |
45 | 45 |
distro.conn.remote_module.write_file( |
46 | 46 |
'/etc/zypp/repos.d/ceph.repo', |
47 | 47 |
ceph_repo_content) |
48 |
pkg_managers.zypper_refresh(distro.conn)
|
|
48 |
distro.packager.clean()
|
|
49 | 49 |
|
50 |
if len(packages):
|
|
51 |
pkg_managers.zypper(distro.conn, packages)
|
|
50 |
if packages:
|
|
51 |
distro.packager.install(packages)
|
|
52 | 52 |
|
53 | 53 |
|
54 | 54 |
def repo_install(distro, reponame, baseurl, gpgkey, **kw): |
... | ... | |
92 | 92 |
) |
93 | 93 |
|
94 | 94 |
# Some custom repos do not need to install ceph |
95 |
if install_ceph and len(packages): |
|
96 |
pkg_managers.zypper(distro.conn, packages) |
|
95 |
if install_ceph and packages: |
|
96 |
distro.packager.install(packages) |
ceph_deploy/hosts/suse/uninstall.py | ||
---|---|---|
1 |
from ceph_deploy.util import pkg_managers |
|
2 |
|
|
3 |
|
|
4 | 1 |
def uninstall(distro, purge=False): |
5 | 2 |
packages = [ |
6 | 3 |
'ceph', |
... | ... | |
10 | 7 |
'librbd1', |
11 | 8 |
'ceph-radosgw', |
12 | 9 |
] |
13 |
pkg_managers.zypper_remove(distro.conn, packages) |
|
10 |
distro.packager.remove(packages) |
Also available in: Unified diff