Merge lp:~james-page/charms/precise/keystone/grizzly-upgrade into lp:~openstack-charmers/charms/precise/keystone/ha-support

[James Page]

Fixes for upgrade to grizzly.

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2013-05-03 08:51:09 +0000
+++ hooks/keystone_hooks.py	2013-05-22 10:35:01 +0000
@@ -45,7 +45,8 @@
 
 packages = [
     "keystone", "python-mysqldb", "pwgen",
-    "haproxy", "python-jinja2", "openssl", "unison"
+    "haproxy", "python-jinja2", "openssl", "unison",
+    "python-sqlalchemy"
     ]
 service = "keystone"
 
@@ -377,6 +378,8 @@
             get_os_version_codename(installed)):
         # TODO: fixup this call to work like utils.install()
         do_openstack_upgrade(config['openstack-origin'], ' '.join(packages))
+        # Ensure keystone group permissions
+        execute("chmod -R g+wrx /var/lib/keystone/")
 
     env_vars = {'OPENSTACK_SERVICE_KEYSTONE': 'keystone',
                 'OPENSTACK_PORT_ADMIN': cluster.determine_api_port(
 
=== modified file 'revision'
--- revision	2013-04-25 16:57:49 +0000
+++ revision	2013-05-22 10:35:01 +0000
@@ -1,1 +1,1 @@
-219
+221