Merge lp:~gandelman-a/charms/precise/hacluster/avoid-osras into lp:~openstack-charmers/charms/quantal/hacluster/trunk

[Adam Gandelman]

Moves installation of the openstack-resource-agents package out of the install hook, and only installs when a principle service requests creation of a resource that uses an ocf script of the "ocf:openstack:*" variety.

This lets us use the hacluster charm on precise (where openstack-resource-agents package is currently unavailable) Currently the only charm that makes use of these OS resource agents is the quantum charm being worked @ lp:~openstack-charmers/charms/precise/quantum-gateway/ha-support

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-01-11 20:38:29 +0000
+++ hooks/hooks.py	2013-01-17 00:56:20 +0000
@@ -18,8 +18,7 @@
 def install():
     utils.juju_log('INFO', 'Begin install hook.')
     utils.configure_source()
-    utils.install('corosync', 'pacemaker',
-                  'openstack-resource-agents', 'python-netaddr')
+    utils.install('corosync', 'pacemaker', 'python-netaddr')
     utils.juju_log('INFO', 'End install hook.')
 
 
@@ -211,6 +210,11 @@
 
     utils.juju_log('INFO', 'Configuring Resources')
     utils.juju_log('INFO', str(resources))
+
+    if True in [ra.startswith('ocf:openstack')
+                for ra in resources.itervalues()]:
+        utils.install('openstack-resource-agents')
+
     for res_name, res_type in resources.iteritems():
         # disable the service we are going to put in HA
         if res_type.split(':')[0] == "lsb":