ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-04 15:29:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use distro.id() instead of distro.name() (#52199)

Browse source 
* Update sys_info unit tests

* Correct distribution values in hostname.py

* Normalize Rhel to Redhat
This commit is contained in:
Sam Doran 2019-03-07 13:25:59 -05:00 • committed by GitHub
parent 85ba4d7c73
commit bf28b5ceca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 104 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

72
lib/ansible/modules/system/hostname.py
View file

@ -579,13 +579,7 @@ class SLESHostname(Hostname):
class OpenSUSEHostname(Hostname):
platform = 'Linux'
distribution = 'Opensuse leap'
strategy_class = SystemdStrategy
class TumbleweedHostname(Hostname):
platform = 'Linux'
distribution = 'Opensuse tumbleweed'
distribution = 'Opensuse'
strategy_class = SystemdStrategy
@ -595,33 +589,9 @@ class ArchHostname(Hostname):
strategy_class = SystemdStrategy
class RedHat5Hostname(Hostname):
platform = 'Linux'
distribution = 'Redhat'
strategy_class = RedHatStrategy
class RHELHostname(Hostname):
platform = 'Linux'
distribution = 'Red hat enterprise linux'
strategy_class = RedHatStrategy
class RedHatServerHostname(Hostname):
platform = 'Linux'
distribution = 'Red hat enterprise linux server'
strategy_class = RedHatStrategy
class RedHatWorkstationHostname(Hostname):
platform = 'Linux'
distribution = 'Red hat enterprise linux workstation'
strategy_class = RedHatStrategy
class RedHatAtomicHostname(Hostname):
platform = 'Linux'
distribution = 'Red hat enterprise linux atomic host'
distribution = 'Redhat'
strategy_class = RedHatStrategy
@ -631,51 +601,27 @@ class CentOSHostname(Hostname):
strategy_class = RedHatStrategy
class CentOSLinuxHostname(Hostname):
platform = 'Linux'
distribution = 'Centos linux'
strategy_class = RedHatStrategy
class CloudlinuxHostname(Hostname):
platform = 'Linux'
distribution = 'Cloudlinux'
strategy_class = RedHatStrategy
class CloudlinuxServerHostname(Hostname):
platform = 'Linux'
distribution = 'Cloudlinux server'
strategy_class = RedHatStrategy
class ScientificHostname(Hostname):
platform = 'Linux'
distribution = 'Scientific'
strategy_class = RedHatStrategy
class ScientificLinuxHostname(Hostname):
platform = 'Linux'
distribution = 'Scientific linux'
strategy_class = RedHatStrategy
class ScientificLinuxCERNHostname(Hostname):
platform = 'Linux'
distribution = 'Scientific linux cern slc'
strategy_class = RedHatStrategy
class OracleLinuxHostname(Hostname):
platform = 'Linux'
distribution = 'Oracle linux server'
distribution = 'Oracle'
strategy_class = RedHatStrategy
class VirtuozzoLinuxHostname(Hostname):
platform = 'Linux'
distribution = 'Virtuozzo linux'
distribution = 'Virtuozzo'
strategy_class = RedHatStrategy
@ -685,12 +631,6 @@ class AmazonLinuxHostname(Hostname):
strategy_class = RedHatStrategy
class SangomaLinuxHostname(Hostname):
platform = 'Linux'
distribution = 'Derived from red hat enterprise linux '
strategy_class = RedHatStrategy
class DebianHostname(Hostname):
platform = 'Linux'
distribution = 'Debian'
@ -729,13 +669,13 @@ class DevuanHostname(Hostname):
class RaspbianHostname(Hostname):
platform = 'Linux'
distribution = 'Raspbian gnu/linux'
distribution = 'Raspbian'
strategy_class = DebianStrategy
class GentooHostname(Hostname):
platform = 'Linux'
distribution = 'Gentoo base system'
distribution = 'Gentoo'
strategy_class = OpenRCStrategy