Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update specs to v. 2014.1.b3
[openstack-build/neutron-build.git]
/
rpm
/
SOURCES
/
neutron-server-setup
diff --git
a/rpm/SOURCES/neutron-server-setup
b/rpm/SOURCES/neutron-server-setup
index d18782359ab240ed75dcd1a1765af456c9d837de..268c64c1189048910ee30e654e20d65e340ae120 100644
(file)
--- a/
rpm/SOURCES/neutron-server-setup
+++ b/
rpm/SOURCES/neutron-server-setup
@@
-167,7
+167,7
@@
case "${NEUTRON_PLUGIN}" in
;;
"openvswitch")
;;
"openvswitch")
- if ! rpm -q openvswitch > /dev/null
+ if ! rpm -q
--whatprovides
openvswitch > /dev/null
then
echo "Please install openvswitch"
exit 0
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
# 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): "
then
if [ -z "${ASSUME_YES}" ] ; then
printf "mysql-server is not installed. Would you like to install it now? (y/n): "