Fix DISTRO_NAME usage for centos7 element
In each of the changed files in this patch, the $DISTRO_NAME usage is checking against "centos". The valid value for the centos7 element for $DISTRO_NAME is "centos7"[1]. [1] http://git.io/8IvuTw Change-Id: I5d59e195c38fc7ff5b3235e195171fafcf5b4f87
This commit is contained in:
parent
ff47faefb0
commit
8cdcac4e5d
|
@ -6,7 +6,7 @@ set -eux
|
|||
set -o pipefail
|
||||
|
||||
|
||||
if [[ "rhel rhel7 centos fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
# we're running a RHEL-based distro, so we need to install to
|
||||
# /usr/share/check-mk-agent/local
|
||||
LOCAL_CHECK_ROOT=/usr/share/check-mk-agent/local
|
||||
|
|
|
@ -25,7 +25,7 @@ $KEYSTONE_VENV_DIR/bin/pip install -U python-ldap ldappool
|
|||
|
||||
# percona-tookit is NOT supported on Fedora (retrieved 25-06-2013)
|
||||
# http://www.percona.com/mysql-support/policies/percona-toolkit-supported-platforms-and-versions
|
||||
if [[ "ubuntu rhel rhel7 centos" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "ubuntu rhel rhel7 centos7" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "$DISTRO_NAME" =~ "rhel" && "$RELEASE" =~ "7." ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
@ -35,7 +35,7 @@ function add_apt_repo() {
|
|||
apt-get update
|
||||
}
|
||||
|
||||
if [[ "rhel rhel7 centos fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
add_yum_repo
|
||||
elif [[ "ubuntu debian" =~ "$DISTRO_NAME" ]]; then
|
||||
add_apt_repo
|
||||
|
|
|
@ -58,7 +58,7 @@ register-state-path /var/lib/mysql
|
|||
[ -d /var/log/mysql ] || install -d -o root -g mysql -m 0775 /var/log/mysql
|
||||
register-state-path --leave-symlink /var/log/mysql
|
||||
|
||||
if [[ "rhel rhel7 centos fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
# mysql clients on redhat expect the socket at /var/lib/mysql/mysql.sock
|
||||
mkdir -p /var/lib/mysql
|
||||
ln -s /var/run/mysqld/mysqld.sock /var/lib/mysql/mysql.sock
|
||||
|
|
|
@ -4,7 +4,7 @@ set -eux
|
|||
|
||||
install-packages openstack-neutron openstack-neutron-ml2
|
||||
|
||||
if [[ "rhel rhel7 centos fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
ln -s /etc/neutron/plugins/ml2/ml2_conf.ini /etc/neutron/plugin.ini
|
||||
|
||||
# Packaged neutron is providing a requires.txt which breaks dependencies at
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
set -eux
|
||||
|
||||
if [[ "rhel rhel7 centos fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
if [[ "rhel rhel7 centos7 fedora" =~ "$DISTRO_NAME" ]]; then
|
||||
# This is a fix so that we can use the service file from the source install
|
||||
# with our packaged nova-baremetal-deploy-helper, which is missing the service:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1055788
|
||||
|
|
Loading…
Reference in New Issue