[openstack-neutron/f20] neutron-server-setup: support mariadb

Pádraig Brady pbrady at fedoraproject.org
Tue Dec 10 14:01:33 UTC 2013


commit 647aaeeb1938945562a3156cc5df0dab69029b59
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 7973dfe..c51bc93 100755
--- a/neutron-server-setup
+++ b/neutron-server-setup
@@ -167,7 +167,7 @@ case "${QUANTUM_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: ${QUANTUM_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