[openstack-nova/el6: 2/2] Merge branch 'master' into el6

[Russell Bryant]

commit 32911a05d777565db4454611015c8ba3097b6088
Merge: e7abb5e e34870e
Author: Russell Bryant <rbryant at redhat.com>
Date:   Tue Dec 6 15:44:18 2011 -0500

    Merge branch 'master' into el6

 openstack-nova-db-setup |  205 +++++++++++++++++++++++++++++++----------------
 openstack-nova.spec     |    5 +-
 2 files changed, 140 insertions(+), 70 deletions(-)
---
diff --cc openstack-nova-db-setup
index cdb626a,1c5a3a5..61ab270
--- a/openstack-nova-db-setup
+++ b/openstack-nova-db-setup
@@@ -29,6 -52,24 +52,24 @@@ EO
  	exit 0
  }
  
+ install_mysql_server() {
+ 	if [ -z "${ASSUME_YES}" ] ; then
+ 		yum install mysql-server
+ 	else
+ 		yum install -y mysql-server
+ 	fi
+ }
+ 
+ start_mysql_server() {
 -	systemctl start mysqld.service
++	service mysqld start
+ }
+ 
+ MYSQL_ROOT_PW=""
+ MYSQL_NOVA_PW_DEFAULT="nova"
+ MYSQL_NOVA_PW=${MYSQL_NOVA_PW_DEFAULT}
+ NOVA_CONFIG="/etc/nova/nova.conf"
+ ASSUME_YES=""
+ 
  while [ $# -gt 0 ]
  do
  	case "$1" in
@@@ -68,23 -124,25 +124,25 @@@ f
  
  # Make sure mysqld is running.
  
 -if ! systemctl status mysqld.service > /dev/null
 +if ! service mysqld status > /dev/null
  then
- 	printf "mysqld is not running.  Would you like to start it now? (y/n): "
- 	read response
- 	case "$response" in
- 		y|Y)
- 			service mysqld start
- 			;;
- 		n|N)
- 			echo "mysqld must be running.  Please start it before proceeding."
- 			exit 0
- 			;;
- 		*)
- 			echo "Invalid response."
- 			exit 1
- 	esac
+ 	if [ -z "${ASSUME_YES}" ] ; then
+ 		printf "mysqld is not running.  Would you like to start it now? (y/n): "
+ 		read response
+ 		case "$response" in
+ 			y|Y)
+ 				;;
+ 			n|N)
+ 				echo "mysqld must be running.  Please start it before proceeding."
+ 				exit 0
+ 				;;
+ 			*)
+ 				echo "Invalid response."
+ 				exit 1
+ 		esac
+ 	fi
  
+ 	start_mysql_server
  fi
  
  
diff --cc openstack-nova.spec
index b3537f3,4088749..b8a29ab
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -442,8 -444,10 +442,11 @@@ f
  %endif
  
  %changelog
+ * Tue Dec 06 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-11
+ - Add --yes, --rootpw, and --novapw options to openstack-nova-db-setup.
+ 
  * Wed Nov 30 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-10
 +- Use updated parallel install versions of epel packages
  - Add libguestfs support
  
  * Tue Nov 29 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-9