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

[Pádraig Brady]

commit 61f92b6543ce8b8e4cc4e7332ab0b8ab51937feb
Merge: 689d6d2 e46351f
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Jan 20 16:36:33 2012 +0000

    Merge branch 'master' into el6

 .gitignore              |    1 +
 openstack-nova-db-setup |   10 ++++++----
 openstack-nova.spec     |   14 ++++++++------
 sources                 |    2 +-
 4 files changed, 16 insertions(+), 11 deletions(-)
---
diff --cc openstack-nova-db-setup
index 61ab270,606df58..6f6771f
--- a/openstack-nova-db-setup
+++ b/openstack-nova-db-setup
@@@ -61,10 -61,9 +61,9 @@@ install_mysql_server() 
  }
  
  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"