Merge lp:~james-page/charms/precise/quantum-gateway/cond-restart into lp:~openstack-charmers/charms/precise/quantum-gateway/ha-support

[James Page]

This change adds support for intelligent restarting of daemons based on configuration files actually changing.

=== modified file '.pydevproject'
--- .pydevproject	2012-12-06 10:22:24 +0000
+++ .pydevproject	2013-04-14 17:42:26 +0000
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
+<?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/quantum-gateway/hooks</path>
+<path>/quantum-gateway/templates</path>
 </pydev_pathproperty>
 </pydev_project>

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-03-20 16:54:49 +0000
+++ hooks/hooks.py	2013-04-14 17:42:26 +0000
@@ -22,6 +22,7 @@
         sys.exit(1)
 
 
[e-mail]_restart(qutils.RESTART_MAP)
 def config_changed():
     if PLUGIN in qutils.GATEWAY_PKGS.keys():
         render_quantum_conf()
@@ -31,13 +32,13 @@
         render_metadata_api_conf()
         render_plugin_conf()
         render_ext_port_upstart()
+        render_evacuate_unit()
         if PLUGIN == qutils.OVS:
             qutils.add_bridge(qutils.INT_BRIDGE)
             qutils.add_bridge(qutils.EXT_BRIDGE)
             ext_port = utils.config_get('ext-port')
             if ext_port:
                 qutils.add_bridge_port(qutils.EXT_BRIDGE, ext_port)
-        restart_agents()
     else:
         utils.juju_log('ERROR',
                        'Please provide a valid plugin config')
@@ -143,6 +144,14 @@
                        )
 
 
+def render_evacuate_unit():
+    context = get_keystone_conf()
+    if context:
+        with open('/usr/local/bin/quantum-evacuate-unit', "w") as conf:
+            conf.write(utils.render_template('evacuate_unit.py', context))
+        os.chmod('/usr/local/bin/quantum-evacuate-unit', 0700)
+
+
 def get_keystone_conf():
     for relid in utils.relation_ids('quantum-network-service'):
         for unit in utils.relation_list(relid):
@@ -181,10 +190,10 @@
                        nova_hostname=utils.unit_get('private-address'))
 
 
[e-mail]_restart(qutils.RESTART_MAP)
 def db_changed():
     render_plugin_conf()
     render_metadata_api_conf()
-    restart_agents()
 
 
 def get_quantum_db_conf():
@@ -224,11 +233,11 @@
                        vhost=qutils.RABBIT_VHOST)
 
 
[e-mail]_restart(qutils.RESTART_MAP)
 def amqp_changed():
     render_dhcp_agent_conf()
     render_quantum_conf()
     render_metadata_api_conf()
-    restart_agents()
 
 
 def get_rabbit_conf():
@@ -250,13 +259,14 @@
     return None
 
 
[e-mail]_restart(qutils.RESTART_MAP)
 def nm_changed():
     render_dhcp_agent_conf()
     render_l3_agent_conf()
     render_metadata_agent_conf()
     render_metadata_api_conf()
+    render_evacuate_unit()
     store_ca_cert()
-    restart_agents()
 
 
 def store_ca_cert():
@@ -274,10 +284,6 @@
     return None
 
 
-def restart_agents():
-    utils.restart(*qutils.GATEWAY_AGENTS[PLUGIN])
-
-
 def cluster_departed():
     conf = get_keystone_conf()
     if conf and cluster.eligible_leader(None):

=== modified file 'hooks/lib/utils.py'
--- hooks/lib/utils.py	2013-03-22 16:56:56 +0000
+++ hooks/lib/utils.py	2013-04-14 17:42:26 +0000
@@ -14,6 +14,7 @@
 import subprocess
 import socket
 import sys
+import hashlib
 
 
 def do_hooks(hooks):
@@ -324,6 +325,32 @@
             return False
 
 
+def file_hash(path):
+    if os.path.exists(path):
+        h = hashlib.md5()
+        with open(path, 'r') as source:
+            h.update(source.read())  # IGNORE:E1101 - it does have update
+        return h.hexdigest()
+    else:
+        return None
+
+
+def inteli_restart(restart_map):
+    def wrap(f):
+        def wrapped_f(*args):
+            checksums = {}
+            for path in restart_map:
+                checksums[path] = file_hash(path)
+            f(*args)
+            restarts = []
+            for path in restart_map:
+                if checksums[path] != file_hash(path):
+                    restarts += restart_map[path]
+            restart(*list(set(restarts)))
+        return wrapped_f
+    return wrap
+
+
 def is_relation_made(relation, key='private-address'):
     for r_id in (relation_ids(relation) or []):
         for unit in (relation_list(r_id) or []):

=== modified file 'hooks/quantum_utils.py'
--- hooks/quantum_utils.py	2013-03-20 17:09:29 +0000
+++ hooks/quantum_utils.py	2013-04-14 17:42:26 +0000
@@ -3,9 +3,7 @@
 import uuid
 import base64
 import apt_pkg as apt
-from random import randint
 from lib.utils import (
-    unit_get,
     juju_log as log
     )
 
@@ -72,6 +70,30 @@
 METADATA_AGENT_CONF = "/etc/quantum/metadata_agent.ini"
 NOVA_CONF = "/etc/nova/nova.conf"
 
+RESTART_MAP = {
+    QUANTUM_CONF: [
+        'quantum-l3-agent',
+        'quantum-dhcp-agent',
+        'quantum-metadata-agent',
+        'quantum-plugin-openvswitch-agent'
+        ],
+    DHCP_AGENT_CONF: [
+        'quantum-dhcp-agent'
+        ],
+    L3_AGENT_CONF: [
+        'quantum-l3-agent'
+        ],
+    METADATA_AGENT_CONF: [
+        'quantum-metadata-agent'
+        ],
+    OVS_PLUGIN_CONF: [
+        'quantum-plugin-openvswitch-agent'
+        ],
+    NOVA_CONF: [
+        'nova-api-metadata'
+        ]
+    }
+
 RABBIT_USER = "nova"
 RABBIT_VHOST = "nova"
 

=== added file 'templates/evacuate_unit.py'
--- templates/evacuate_unit.py	1970-01-01 00:00:00 +0000
+++ templates/evacuate_unit.py	2013-04-14 17:42:26 +0000
@@ -0,0 +1,70 @@
+#!/usr/bin/python
+
+import subprocess
+
+
+def log(priority, message):
+    print "{}: {}".format(priority, message)
+
+DHCP_AGENT = "DHCP Agent"
+L3_AGENT = "L3 Agent"
+
+
+def evacuate_unit(unit):
+    ''' Use agent scheduler API to detect down agents and re-schedule '''
+    from quantumclient.v2_0 import client
+    # TODO: Fixup for https keystone
+    auth_url = 'http://{{ keystone_host }}:{{ auth_port }}/v2.0'
+    quantum = client.Client(username='{{ service_username }}',
+                            password='{{ service_password }}',
+                            tenant_name='{{ service_tenant }}',
+                            auth_url=auth_url,
+                            region_name='{{ region }}')
+
+    agents = quantum.list_agents(agent_type=DHCP_AGENT)
+    dhcp_agents = []
+    l3_agents = []
+    networks = {}
+    for agent in agents['agents']:
+        if agent['alive'] and agent['host'] != unit:
+            dhcp_agents.append(agent['id'])
+        elif agent['host'] == unit:
+            for network in \
+                quantum.list_networks_on_dhcp_agent(agent['id'])['networks']:
+                networks[network['id']] = agent['id']
+
+    agents = quantum.list_agents(agent_type=L3_AGENT)
+    routers = {}
+    for agent in agents['agents']:
+        if agent['alive'] and agent['host'] != unit:
+            l3_agents.append(agent['id'])
+        elif agent['host'] == unit:
+            for router in \
+                quantum.list_routers_on_l3_agent(agent['id'])['routers']:
+                routers[router['id']] = agent['id']
+
+    index = 0
+    for router_id in routers:
+        agent = index % len(l3_agents)
+        log('INFO',
+            'Moving router %s from %s to %s' % \
+            (router_id, routers[router_id], l3_agents[agent]))
+        quantum.remove_router_from_l3_agent(l3_agent=routers[router_id],
+                                            router_id=router_id)
+        quantum.add_router_to_l3_agent(l3_agent=l3_agents[agent],
+                                       body={'router_id': router_id})
+        index += 1
+
+    index = 0
+    for network_id in networks:
+        agent = index % len(dhcp_agents)
+        log('INFO',
+            'Moving network %s from %s to %s' % \
+            (network_id, networks[network_id], dhcp_agents[agent]))
+        quantum.remove_network_from_dhcp_agent(dhcp_agent=networks[network_id],
+                                               network_id=network_id)
+        quantum.add_network_to_dhcp_agent(dhcp_agent=dhcp_agents[agent],
+                                          body={'network_id': network_id})
+        index += 1
+
+evacuate_unit(subprocess.check_output(['hostname', '-f']).strip())