openstack
/
deb-sahara
Code Issues Proposed changes

_get_os_distrib() can return 'redhat', add mapping 

The unified function returns simply 'redhat' and not 'redhatenterpriselinux'
when executed against RHEL systems. Add the mapping to enable few
validations and other operations.

Change-Id: Ifcc85703a788d2960d20792d817a490f382c1f88
This commit is contained in:
Luigi Toscano 2017-03-30 19:37:47 +02:00
parent 70a5526c00
commit edde55febc
5 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sahara/plugins/images.py
View File

@ -183,6 +183,7 @@ class SaharaImageValidatorBase(ImageValidator):
'centos': 'redhat',
'centos7': 'redhat',
'fedora': 'redhat',
'redhat': 'redhat',
'redhatenterpriseserver': 'redhat',
'ubuntu': 'debian'
}

2
sahara/plugins/mapr/services/mysql/mysql.py
View File

@ -58,7 +58,7 @@ class MySQL(s.Service):
return 'mysql'
if distro.lower() == 'suse':
return 'mysqld'
if distro.lower() in ['centos', 'redhatenterpriseserver']:
if distro.lower() in ['centos', 'redhatenterpriseserver', 'redhat']:
if distro_version.split('.')[0] == '7':
return 'mariadb'
return 'mysqld'

1
sahara/service/edp/shares.py
View File

@ -219,6 +219,7 @@ class _NFSMounter(_ShareHandler):
"centos": _REDHAT_INSTALL,
"fedora": _REDHAT_INSTALL,
"redhatenterpriseserver": _REDHAT_INSTALL,
"redhat": _REDHAT_INSTALL,
"ubuntu": _DEBIAN_INSTALL
}

1
sahara/service/volumes.py
View File

@ -70,6 +70,7 @@ def _check_installed_xfs(instance):
"centos": redhat,
"fedora": redhat,
"redhatenterpriseserver": redhat,
"redhat": redhat,
"ubuntu": debian,
'debian': debian
}

2
sahara/tests/unit/plugins/test_images.py
View File

@ -201,7 +201,7 @@ class TestImages(b.SaharaTestCase):
"rpm -q java-8 hadoop", run_as_root=True)
self.assertEqual(remote.execute_command.call_count, 1)
image_arguments = {"distro": 'redhatenterpriseserver'}
image_arguments = {"distro": 'redhat'}
packages = [cls.Package("java", "8"), cls.Package("hadoop")]
validator = images.SaharaPackageValidator(packages)
remote = mock.Mock()