[openstack-neutron/el6-havana] neutron-server-setup: support mariadb
Pádraig Brady
pbrady at fedoraproject.org
Tue Dec 10 14:02:06 UTC 2013
commit 8245ac44b67cdc36c0ca17411aac5305ad9d6eeb
Author: Pádraig Brady <P at draigBrady.com>
Date: Tue Dec 10 13:59:14 2013 +0000
neutron-server-setup: support mariadb
* neutron-server-setup: Use --whatprovides to allow for package renames
neutron-server-setup | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/neutron-server-setup b/neutron-server-setup
index d187823..268c64c 100755
--- a/neutron-server-setup
+++ b/neutron-server-setup
@@ -167,7 +167,7 @@ case "${NEUTRON_PLUGIN}" in
;;
"openvswitch")
- if ! rpm -q openvswitch > /dev/null
+ if ! rpm -q --whatprovides openvswitch > /dev/null
then
echo "Please install openvswitch"
exit 0
@@ -199,7 +199,7 @@ echo "Plugin: ${NEUTRON_PLUGIN} => Database: ${DB_NAME}"
# Make sure MySQL is installed.
NEW_MYSQL_INSTALL=0
-if ! rpm -q mysql-server > /dev/null
+if ! rpm -q --whatprovides mysql-server > /dev/null
then
if [ -z "${ASSUME_YES}" ] ; then
printf "mysql-server is not installed. Would you like to install it now? (y/n): "
More information about the scm-commits
mailing list