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

[James Page]

Fixup for upgrade failures

[Adam Gandelman (gandelman-a)]

review: Approve

[Adam Gandelman (gandelman-a)]

Approving, though I'm a bit concerned that the call to utils.install() here might trigger an unintended upgrade of some package that would require user interaction. Eg: A newer keystone package has been published since the install hook was run, apt-get update was run out of band, and upgrade_charm() ends up attempting to install the new keystone, which would require user interaction to deal with modfieid configs. I think we can handle this by fixing utils.install() to only install packages that are not yet installed, instead of installing everything again.

=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2013-04-09 18:07:32 +0000
+++ hooks/keystone_hooks.py	2013-05-03 08:56:30 +0000
@@ -415,6 +415,8 @@
 
 
 def upgrade_charm():
+    # Ensure all required packages are installed
+    utils.install(*packages)
     cluster_changed()
     if cluster.eligible_leader(CLUSTER_RES):
         utils.juju_log('INFO',