From 6db2c6683539f2ece46f66cdb19df62228f9bae4 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 2 Jul 2019 23:59:48 -0700 Subject: [PATCH] Revert "[stable-2.8] hostname - fix Oracle Linux (#58510)" This reverts commit dd304b48116f3b1f10f769e1cc3a34c702b81d8f. Only affects 2.9+ as it is introduced by bundling a new version of distro --- changelogs/fragments/hostname-oracle-linux-regeression.yaml | 2 -- lib/ansible/modules/system/hostname.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 changelogs/fragments/hostname-oracle-linux-regeression.yaml diff --git a/changelogs/fragments/hostname-oracle-linux-regeression.yaml b/changelogs/fragments/hostname-oracle-linux-regeression.yaml deleted file mode 100644 index 9f4f57df742..00000000000 --- a/changelogs/fragments/hostname-oracle-linux-regeression.yaml +++ /dev/null @@ -1,2 +0,0 @@ -bugfixes: - - hostname - fix regression with Oracle Linux (https://github.com/ansible/ansible/issues/42726) diff --git a/lib/ansible/modules/system/hostname.py b/lib/ansible/modules/system/hostname.py index 67212a85b97..e064b23fe85 100644 --- a/lib/ansible/modules/system/hostname.py +++ b/lib/ansible/modules/system/hostname.py @@ -639,7 +639,7 @@ class ScientificHostname(Hostname): class OracleLinuxHostname(Hostname): platform = 'Linux' - distribution = 'Oracle' + distribution = 'Ol' strategy_class = RedHatStrategy