Repository: cloudstack Updated Branches: refs/heads/master a1e8d5eef -> 75d01971e
CLOUDSTACK-7546: cloudstack-setup-agent considers distro as RHEL5 if no conditions match. Add check to identify RHEL7 distro and consider it as RHEL6. If there is anything specific required for RHEL7, it can be added later Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/75d01971 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/75d01971 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/75d01971 Branch: refs/heads/master Commit: 75d01971e8d5f27f65ba0b98fc6d9aba057757e7 Parents: a1e8d5e Author: Kishan Kavala <kis...@apache.org> Authored: Tue Sep 16 20:59:37 2014 +0530 Committer: Kishan Kavala <kis...@apache.org> Committed: Tue Sep 16 21:03:01 2014 +0530 ---------------------------------------------------------------------- python/lib/cloudutils/utilities.py | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75d01971/python/lib/cloudutils/utilities.py ---------------------------------------------------------------------- diff --git a/python/lib/cloudutils/utilities.py b/python/lib/cloudutils/utilities.py index f7f25f4..ea0384b 100755 --- a/python/lib/cloudutils/utilities.py +++ b/python/lib/cloudutils/utilities.py @@ -112,6 +112,8 @@ class Distribution: version = file("/etc/redhat-release").readline() if version.find("Red Hat Enterprise Linux Server release 6") != -1 or version.find("Scientific Linux release 6") != -1 or version.find("CentOS Linux release 6") != -1 or version.find("CentOS release 6.") != -1: self.distro = "RHEL6" + elif version.find("Red Hat Enterprise Linux Server release 7") != -1: + self.distro = "RHEL6" elif version.find("CentOS release") != -1: self.distro = "CentOS" else:
