openstack/devstack
Code Issues Proposed changes

Merge "Add installation support for Oracle Linux 7"

Browse Source
This commit is contained in:
Jenkins 2016-04-14 01:42:02 +00:00 committed by Gerrit Code Review
commit a344608ca9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions-common
View File

@ -380,7 +380,7 @@ function GetDistro {
DISTRO="sle${os_RELEASE%.*}" DISTRO="sle${os_RELEASE%.*}"
elif [[ "$os_VENDOR" =~ (Red.*Hat) || \ elif [[ "$os_VENDOR" =~ (Red.*Hat) || \
"$os_VENDOR" =~ (CentOS) || \ "$os_VENDOR" =~ (CentOS) || \
"$os_VENDOR" =~ (OracleLinux) || \ "$os_VENDOR" =~ (OracleServer) || \
"$os_VENDOR" =~ (Virtuozzo) ]]; then "$os_VENDOR" =~ (Virtuozzo) ]]; then
# Drop the . release as we assume it's compatible # Drop the . release as we assume it's compatible
# XXX re-evaluate when we get RHEL10 # XXX re-evaluate when we get RHEL10
@ -427,7 +427,7 @@ function is_oraclelinux {
GetOSVersion GetOSVersion
fi fi
[ "$os_VENDOR" = "OracleLinux" ] [ "$os_VENDOR" = "OracleServer" ]
} }
@ -441,7 +441,7 @@ function is_fedora {
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ [ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \
[ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \ [ "$os_VENDOR" = "RedHatEnterpriseServer" ] || \
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \ [ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleServer" ] || \
[ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ] [ "$os_VENDOR" = "Virtuozzo" ] || [ "$os_VENDOR" = "kvmibm" ]
} }