Juju Charms Collection
keystone package

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

  1. Precise Pangolin (12.04)
  2. grizzly-upgrade
  3. Merge into ha-support
Proposed by James Page
Status: Merged
Merged at revision: 70
Proposed branch: lp:~james-page/charms/precise/keystone/grizzly-upgrade
Merge into: lp:~openstack-charmers/charms/precise/keystone/ha-support
Diff against target: 29 lines (+5/-2)
2 files modified
hooks/keystone_hooks.py (+4/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/precise/keystone/grizzly-upgrade
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+165057@code.launchpad.net

Description of the change

Fixes for upgrade to grizzly.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/keystone_hooks.py'
2--- hooks/keystone_hooks.py 2013-05-03 08:51:09 +0000
3+++ hooks/keystone_hooks.py 2013-05-22 10:35:01 +0000
4@@ -45,7 +45,8 @@
5
6 packages = [
7 "keystone", "python-mysqldb", "pwgen",
8- "haproxy", "python-jinja2", "openssl", "unison"
9+ "haproxy", "python-jinja2", "openssl", "unison",
10+ "python-sqlalchemy"
11 ]
12 service = "keystone"
13
14@@ -377,6 +378,8 @@
15 get_os_version_codename(installed)):
16 # TODO: fixup this call to work like utils.install()
17 do_openstack_upgrade(config['openstack-origin'], ' '.join(packages))
18+ # Ensure keystone group permissions
19+ execute("chmod -R g+wrx /var/lib/keystone/")
20
21 env_vars = {'OPENSTACK_SERVICE_KEYSTONE': 'keystone',
22 'OPENSTACK_PORT_ADMIN': cluster.determine_api_port(
23
24=== modified file 'revision'
25--- revision 2013-04-25 16:57:49 +0000
26+++ revision 2013-05-22 10:35:01 +0000
27@@ -1,1 +1,1 @@
28-219
29+221

Subscribers

People subscribed via source and target branches