Merge lp:~corey.bryant/charms/trusty/quantum-gateway/end-of-life into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

[Corey Bryant]

[Corey Bryant (corey.bryant)]

We need to let users know they shouldn't use the quantum-gateway charm. This patch uses status-set to let users know it's EOL and they should use the neutron-gateway charm instead.

The two options I debated were:
 1) sys.exit(1) in install hook (doesn't allow you to set a status message; could set log message but user has to look in log)
 2) set status to 'blocked' with corresponding message* (doesn't fail the deployment but displays a clear message to 'juju status')

* status-set can only set the state to 'maintenance', 'blocked', 'waiting', or 'active'.

I went with option 2 in this patch, so deployment will look successful and 'juju status' will show the following:

'status-get'
valid_states = ['maintenance', 'blocked', 'waiting', 'active']
  neutron-gateway:
    charm: local:trusty/quantum-gateway-64
    exposed: false
    service-status:
      current: blocked
      message: Charm has reached end-of-life. Please use neutron-gateway charm.
      since: 16 Jul 2015 18:11:14Z
    relations:
      amqp:
      - rabbitmq-server
      cluster:
      - neutron-gateway
      neutron-plugin-api:
      - neutron-api
      quantum-network-service:
      - nova-cloud-controller
      shared-db:
      - mysql
    units:
      neutron-gateway/0:
        workload-status:
          current: blocked
          message: Charm has reached end-of-life. Please use neutron-gateway charm.
          since: 16 Jul 2015 18:11:14Z
        agent-status:
          current: idle
          since: 16 Jul 2015 18:17:59Z
          version: 1.24.2
        agent-state: started
        agent-version: 1.24.2
        machine: "12"
        public-address: 10.5.3.37

[Corey Bryant (corey.bryant)]

I also stripped out any functionality from the charm.

[lp:~corey.bryant/charms/trusty/quantum-gateway/end-of-life]

115. By Corey Bryant on 2015-07-16

quantum-gateway charm has reached end-of-life

Strip all functionality from charm and issue status message
reporting end-of-life and pointing users to neutron-gateway charm.

[James Page (james-page)]

Aside from the amendment to the README I think this is OK.

review: Approve

[Corey Bryant (corey.bryant)]

James, Good point. I responded below. I hit a bug testing the charm upgrade and proposed a fix to charm-helpers.

=== modified file '.bzrignore'
--- .bzrignore	2015-04-10 14:22:04 +0000
+++ .bzrignore	2015-07-16 19:59:55 +0000
@@ -1,3 +1,2 @@
 bin
-.coverage
 tags

=== removed file '.coveragerc'
--- .coveragerc	2013-07-19 09:46:25 +0000
+++ .coveragerc	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-[report]
-# Regexes for lines to exclude from consideration
-exclude_lines =
-    if __name__ == .__main__.:
-include=
-    hooks/quantum_*

=== removed file '.project'
--- .project	2012-12-06 10:22:24 +0000
+++ .project	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>quantum-gateway</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.python.pydev.PyDevBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.python.pydev.pythonNature</nature>
-	</natures>
-</projectDescription>

=== removed file '.pydevproject'
--- .pydevproject	2013-07-19 09:46:25 +0000
+++ .pydevproject	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?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/unit_tests</path>
-</pydev_pathproperty>
-</pydev_project>

=== modified file 'Makefile'
--- Makefile	2015-04-16 21:32:07 +0000
+++ Makefile	2015-07-16 19:59:55 +0000
@@ -2,13 +2,9 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers actions hooks unit_tests tests
+	@flake8 --exclude hooks/charmhelpers hooks
 	@charm proof
 
-unit_test:
-	@echo Starting unit tests...
-	@$(PYTHON) /usr/bin/nosetests --nologcapture --with-coverage unit_tests
-
 bin/charm_helpers_sync.py:
 	@mkdir -p bin
 	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
@@ -16,14 +12,6 @@
 
 sync: bin/charm_helpers_sync.py
 	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-hooks.yaml
-	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-tests.yaml
-
-test:
-	@echo Starting Amulet tests...
-	# coreycb note: The -v should only be temporary until Amulet sends
-	# raise_status() messages to stderr:
-	#   https://bugs.launchpad.net/amulet/+bug/1320357
-	@juju test -v -p AMULET_HTTP_PROXY,AMULET_OS_VIP --timeout 2700
 
 publish: lint unit_test
 	bzr push lp:charms/quantum-gateway

=== modified file 'README.md'
--- README.md	2015-05-01 10:33:20 +0000
+++ README.md	2015-07-16 19:59:55 +0000
@@ -1,210 +1,4 @@
 Overview
 --------
 
-Neutron provides flexible software defined networking (SDN) for OpenStack.
-
-This charm is designed to be used in conjunction with the rest of the OpenStack
-related charms in the charm store) to virtualized the network that Nova Compute
-instances plug into.
-
-Its designed as a replacement for nova-network; however it does not yet
-support all of the features as nova-network (such as multihost) so may not
-be suitable for all.
-
-Neutron supports a rich plugin/extension framework for propriety networking
-solutions and supports (in core) Nicira NVP, NEC, Cisco and others...
-
-The Openstack charms currently only support the fully free OpenvSwitch plugin
-and implements the 'Provider Router with Private Networks' use case.
-
-See the upstream [Neutron documentation](http://docs.openstack.org/trunk/openstack-network/admin/content/use_cases_single_router.html)
-for more details.
-
-
-Usage
------
-
-In order to use Neutron with Openstack, you will need to deploy the
-nova-compute and nova-cloud-controller charms with the network-manager
-configuration set to 'Neutron':
-
-    nova-cloud-controller:
-        network-manager: Neutron
-
-This decision must be made prior to deploying Openstack with Juju as
-Neutron is deployed baked into these charms from install onwards:
-
-    juju deploy nova-compute
-    juju deploy --config config.yaml nova-cloud-controller
-    juju add-relation nova-compute nova-cloud-controller
-
-The Neutron Gateway can then be added to the deploying:
-
-    juju deploy quantum-gateway
-    juju add-relation quantum-gateway mysql
-    juju add-relation quantum-gateway rabbitmq-server
-    juju add-relation quantum-gateway nova-cloud-controller
-
-The gateway provides two key services; L3 network routing and DHCP services.
-
-These are both required in a fully functional Neutron Openstack deployment.
-
-See upstream [Neutron multi extnet](http://docs.openstack.org/trunk/config-reference/content/adv_cfg_l3_agent_multi_extnet.html)
-
-Configuration Options
----------------------
-
-External Port Configuration
-===========================
-
-If the port to be used for external traffic is consistent accross all physical
-servers then is can be specified by simply setting ext-port to the nic id:
-
-    quantum-gateway:
-        ext-port: eth2
-
-However, if it varies between hosts then the mac addresses of the external
-nics for each host can be passed as a space seperated list:
-
-    quantum-gateway:
-        ext-port: <MAC ext port host 1> <MAC ext port host 2> <MAC ext port host 3>
-
-
-Multiple Floating Pools
-=======================
-
-If multiple floating pools are needed then an L3 agent (which corresponds to
-a quantum-gateway for the sake of this charm) is needed for each one. Each
-gateway needs to be deployed as a seperate service so that the external
-network id can be set differently for each gateway e.g.
-
-    juju deploy quantum-gateway quantum-gateway-extnet1
-    juju add-relation quantum-gateway-extnet1 mysql
-    juju add-relation quantum-gateway-extnet1 rabbitmq-server
-    juju add-relation quantum-gateway-extnet1 nova-cloud-controller
-    juju deploy quantum-gateway quantum-gateway-extnet2
-    juju add-relation quantum-gateway-extnet2 mysql
-    juju add-relation quantum-gateway-extnet2 rabbitmq-server
-    juju add-relation quantum-gateway-extnet2 nova-cloud-controller
-
-    Create extnet1 and extnet2 via neutron client and take a note of their ids
-
-    juju set quantum-gateway-extnet1 "run-internal-router=leader"
-    juju set quantum-gateway-extnet2 "run-internal-router=none"
-    juju set quantum-gateway-extnet1 "external-network-id=<extnet1 id>"
-    juju set quantum-gateway-extnet2 "external-network-id=<extnet2 id>"
-
-Instance MTU
-============
-
-When using Open vSwitch plugin with GRE tunnels default MTU of 1500 can cause
-packet fragmentation due to GRE overhead. One solution is to increase the MTU on
-physical hosts and network equipment. When this is not possible or practical the
-charm's instance-mtu option can be used to reduce instance MTU via DHCP.
-
-    juju set quantum-gateway instance-mtu=1400
-
-OpenStack upstream documentation recomments a MTU value of 1400:
-[Openstack documentation](http://docs.openstack.org/admin-guide-cloud/content/openvswitch_plugin.html)
-
-Note that this option was added in Havana and will be ignored in older releases.
-
-Deploying from source
-=====================
-
-The minimum openstack-origin-git config required to deploy from source is:
-
-    openstack-origin-git: include-file://neutron-juno.yaml
-
-    neutron-juno.yaml
-    -----------------
-    repositories:
-    - {name: requirements,
-       repository: 'git://github.com/openstack/requirements',
-       branch: stable/juno}
-    - {name: neutron,
-       repository: 'git://github.com/openstack/neutron',
-       branch: stable/juno}
-
-Note that there are only two 'name' values the charm knows about: 'requirements'
-and 'neutron'. These repositories must correspond to these 'name' values.
-Additionally, the requirements repository must be specified first and the
-neutron repository must be specified last. All other repostories are installed
-in the order in which they are specified.
-
-The following is a full list of current tip repos (may not be up-to-date):
-
-    openstack-origin-git: include-file://neutron-master.yaml
-
-    neutron-master.yaml
-    -------------------
-    repositories:
-    - {name: requirements,
-       repository: 'git://github.com/openstack/requirements',
-       branch: master}
-    - {name: oslo-concurrency,
-       repository: 'git://github.com/openstack/oslo.concurrency',
-       branch: master}
-    - {name: oslo-config,
-       repository: 'git://github.com/openstack/oslo.config',
-       branch: master}
-    - {name: oslo-context,
-       repository: 'git://github.com/openstack/oslo.context',
-       branch: master}
-    - {name: oslo-db,
-       repository: 'git://github.com/openstack/oslo.db',
-       branch: master}
-    - {name: oslo-i18n,
-       repository: 'git://github.com/openstack/oslo.i18n',
-       branch: master}
-    - {name: oslo-messaging,
-       repository: 'git://github.com/openstack/oslo.messaging',
-       branch: master}
-    - {name: oslo-middleware,
-       repository': 'git://github.com/openstack/oslo.middleware',
-       branch: master}
-    - {name: oslo-rootwrap',
-       repository: 'git://github.com/openstack/oslo.rootwrap',
-       branch: master}
-    - {name: oslo-serialization,
-       repository: 'git://github.com/openstack/oslo.serialization',
-       branch: master}
-    - {name: oslo-utils,
-       repository: 'git://github.com/openstack/oslo.utils',
-       branch: master}
-    - {name: pbr,
-       repository: 'git://github.com/openstack-dev/pbr',
-       branch: master}
-    - {name: stevedore,
-       repository: 'git://github.com/openstack/stevedore',
-       branch: 'master'}
-    - {name: python-keystoneclient,
-       repository: 'git://github.com/openstack/python-keystoneclient',
-       branch: master}
-    - {name: python-neutronclient,
-       repository: 'git://github.com/openstack/python-neutronclient',
-       branch: master}
-    - {name: python-novaclient,
-       repository': 'git://github.com/openstack/python-novaclient',
-       branch: master}
-    - {name: keystonemiddleware,
-       repository: 'git://github.com/openstack/keystonemiddleware',
-       branch: master}
-    - {name: neutron-fwaas,
-       repository': 'git://github.com/openstack/neutron-fwaas',
-       branch: master}
-    - {name: neutron-lbaas,
-       repository: 'git://github.com/openstack/neutron-lbaas',
-       branch: master}
-    - {name: neutron-vpnaas,
-       repository: 'git://github.com/openstack/neutron-vpnaas',
-       branch: master}
-    - {name: neutron,
-       repository: 'git://github.com/openstack/neutron',
-       branch: master}
-
-TODO
-----
-
- * Provide more network configuration use cases.
- * Support VLAN in addition to GRE+OpenFlow for L2 separation.
+This charm has reached end-of-life.  Please use the neutron-gateway charm.

=== removed directory 'actions'
=== removed file 'actions.yaml'
--- actions.yaml	2015-04-10 14:22:04 +0000
+++ actions.yaml	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-git-reinstall:
-    description: Reinstall quantum-gateway from the openstack-origin-git repositories.

=== removed symlink 'actions/git-reinstall'
=== target was u'git_reinstall.py'
=== removed file 'actions/git_reinstall.py'
--- actions/git_reinstall.py	2015-04-15 16:46:22 +0000
+++ actions/git_reinstall.py	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-#!/usr/bin/python
-import sys
-import traceback
-
-sys.path.append('hooks/')
-
-from charmhelpers.contrib.openstack.utils import (
-    git_install_requested,
-)
-
-from charmhelpers.core.hookenv import (
-    action_set,
-    action_fail,
-    config,
-)
-
-from quantum_utils import (
-    git_install,
-)
-
-from quantum_hooks import (
-    config_changed,
-)
-
-
-def git_reinstall():
-    """Reinstall from source and restart services.
-
-    If the openstack-origin-git config option was used to install openstack
-    from source git repositories, then this action can be used to reinstall
-    from updated git repositories, followed by a restart of services."""
-    if not git_install_requested():
-        action_fail('openstack-origin-git is not configured')
-        return
-
-    try:
-        git_install(config('openstack-origin-git'))
-        config_changed()
-    except:
-        action_set({'traceback': traceback.format_exc()})
-        action_fail('git-reinstall resulted in an unexpected error')
-
-
-if __name__ == '__main__':
-    git_reinstall()

=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-05-02 22:35:06 +0000
+++ charm-helpers-hooks.yaml	2015-07-16 19:59:55 +0000
@@ -2,12 +2,3 @@
 destination: hooks/charmhelpers
 include:
     - core
-    - fetch
-    - contrib.openstack|inc=*
-    - contrib.hahelpers
-    - contrib.network
-    - contrib.python.packages
-    - contrib.storage.linux
-    - contrib.python
-    - payload.execd
-    - contrib.charmsupport

=== removed file 'charm-helpers-tests.yaml'
--- charm-helpers-tests.yaml	2015-05-02 22:35:06 +0000
+++ charm-helpers-tests.yaml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-branch: lp:charm-helpers
-destination: tests/charmhelpers
-include:
-    - contrib.amulet
-    - contrib.openstack.amulet

=== removed directory 'files'
=== removed file 'files/NeutronAgentMon'
--- files/NeutronAgentMon	2015-01-15 10:00:38 +0000
+++ files/NeutronAgentMon	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-#!/bin/sh
-#
-#
-#	NeutronAgentMon OCF RA.
-#	Starts crm_mon in background which logs cluster status as
-#	html to the specified file.
-#
-#       Copyright 2014 Canonical Ltd.
-#
-#       Authors: Hui Xiang <[e-mail]>
-#                Edward Hope-Morley <[e-mail]>
-#
-# OCF instance parameters:
-#	OCF_RESKEY_file
-
-#######################################################################
-# Initialization:
-: ${OCF_FUNCTIONS=${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs}
-. ${OCF_FUNCTIONS}
-: ${__OCF_ACTION=$1}
-
-#######################################################################
-
-meta_data() {
-	cat <<END
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="NeutronAgentMon">
-<version>1.0</version>
-
-<longdesc lang="en">
-This is a NeutronAgentMon Resource Agent.
-It monitors the 'neutron-ha-monitor daemon' status.
-</longdesc>
-<shortdesc lang="en">Monitor '/usr/local/bin/neutron-ha-monitor.py' in the background.</shortdesc>
-
-<parameters>
-
-<parameter name="file" unique="0">
-<longdesc lang="en">
-The file we want to run as a daemon.
-</longdesc>
-<shortdesc lang="en">The file we want to run as a daemon.</shortdesc>
-<content type="string" default="/usr/local/bin/neutron-ha-monitor.py" />
-</parameter>
-
-</parameters>
-
-<actions>
-<action name="start"   timeout="20" />
-<action name="stop"    timeout="20" />
-<action name="monitor" depth="0"  timeout="20" interval="60" />
-<action name="meta-data"  timeout="5" />
-<action name="validate-all"  timeout="30" />
-</actions>
-</resource-agent>
-END
-}
-
-#######################################################################
-
-NeutronAgentMon_usage() {
-	cat <<END
-usage: $0 {start|stop|monitor|validate-all|meta-data}
-
-Expects to have a fully populated OCF RA-compliant environment set.
-END
-}
-
-NeutronAgentMon_exit() {
-    if [ $1 != 0 ]; then
-        exit $OCF_ERR_GENERIC
-    else
-        exit $OCF_SUCCESS
-    fi
-}
-
-NeutronAgentMon_start() {
-    pid=`sudo ps -aux | grep neutron-ha-m\[o\]nitor.py | awk -F' ' '{print $2}'`
-    if [ -z $pid ]; then
-        ocf_log info "[NeutronAgentMon_start] Start Monitor daemon."
-        sudo mkdir -p /var/log/neutron-ha
-        sudo python /usr/local/bin/neutron-ha-monitor.py \
-        --config-file /var/lib/juju-neutron-ha/neutron-ha-monitor.conf \
-        --log-file /var/log/neutron-ha/monitor.log >> /dev/null 2>&1 & echo $!
-        sleep 5
-    else
-        ocf_log warn "[NeutronAgentMon_start] Monitor daemon already running."
-    fi
-    NeutronAgentMon_exit $?
-}
-
-NeutronAgentMon_stop() {
-    pid=`sudo ps -aux | grep neutron-ha-m\[o\]nitor.py | awk -F' ' '{print $2}'`
-    if [ ! -z $pid ]; then
-        sudo kill -s 9 $pid
-        ocf_log info "[NeutronAgentMon_stop] Pid $pid is killed."
-    else
-        ocf_log warn "[NeutronAgentMon_stop] Monitor daemon already stopped."
-    fi
-    NeutronAgentMon_exit 0
-}
-
-NeutronAgentMon_monitor() {
-    pid=`sudo ps -aux | grep neutron-ha-m\[o\]nitor.py | awk -F' ' '{print $2}'`
-    if [ ! -z $pid ]; then
-        ocf_log info "[NeutronAgentMon_monitor] success."
-        exit $OCF_SUCCESS
-    fi
-    exit $OCF_NOT_RUNNING
-}
-
-NeutronAgentMon_validate() {
-# Existence of the user
-    if [ -f $OCF_RESKEY_file ]; then
-        echo "Validate OK"
-        return $OCF_SUCCESS
-    else
-        ocf_log err "The file $OCF_RESKEY_file does not exist!"
-	exit $OCF_ERR_ARGS
-    fi
-}
-
-if [ $# -ne 1 ]; then
-    NeutronAgentMon_usage
-    exit $OCF_ERR_ARGS
-fi
-
-: ${OCF_RESKEY_update:="15000"}
-: ${OCF_RESKEY_pidfile:="/tmp/NeutronAgentMon_${OCF_RESOURCE_INSTANCE}.pid"}
-: ${OCF_RESKEY_htmlfile:="/tmp/NeutronAgentMon_${OCF_RESOURCE_INSTANCE}.html"}
-
-OCF_RESKEY_update=`expr $OCF_RESKEY_update / 1000`
-
-case $__OCF_ACTION in
-meta-data)	meta_data
-		exit $OCF_SUCCESS
-		;;
-start)		NeutronAgentMon_start
-		;;
-stop)		NeutronAgentMon_stop
-		;;
-monitor)	NeutronAgentMon_monitor
-		;;
-validate-all)	NeutronAgentMon_validate
-		;;
-usage|help)	NeutronAgentMon_usage
-		exit $OCF_SUCCESS
-		;;
-*)		NeutronAgentMon_usage
-		exit $OCF_ERR_UNIMPLEMENTED
-		;;
-esac
-
-exit $?

=== removed file 'files/neutron-ha-monitor.conf'
--- files/neutron-ha-monitor.conf	2015-01-15 10:00:38 +0000
+++ files/neutron-ha-monitor.conf	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[DEFAULT]
-verbose=True
-#debug=True
-check_interval=8

=== removed file 'files/neutron-ha-monitor.py'
--- files/neutron-ha-monitor.py	2015-01-19 10:43:09 +0000
+++ files/neutron-ha-monitor.py	1970-01-01 00:00:00 +0000
@@ -1,436 +0,0 @@
-# Copyright 2014 Canonical Ltd.
-#
-# Authors: Hui Xiang <[e-mail]>
-#          Joshua Zhang <[e-mail]>
-#          Edward Hope-Morley <[e-mail]>
-#
-
-"""
-Helpers for monitoring Neutron agents, reschedule failed agents,
-cleaned resources on failed nodes.
-"""
-
-import os
-import re
-import sys
-import signal
-import socket
-import subprocess
-import time
-
-from oslo.config import cfg
-from neutron.agent.linux import ovs_lib
-from neutron.agent.linux import ip_lib
-from neutron.common import exceptions
-from neutron.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
-
-class Daemon(object):
-    """A generic daemon class.
-
-    Usage: subclass the Daemon class and override the run() method
-    """
-    def __init__(self, stdin='/dev/null', stdout='/dev/null',
-                 stderr='/dev/null', procname='python'):
-        self.stdin = stdin
-        self.stdout = stdout
-        self.stderr = stderr
-        self.procname = procname
-
-    def _fork(self):
-        try:
-            pid = os.fork()
-            if pid > 0:
-                sys.exit(0)
-        except OSError:
-            LOG.exception('Fork failed')
-            sys.exit(1)
-
-    def daemonize(self):
-        """Daemonize process by doing Stevens double fork."""
-        # fork first time
-        self._fork()
-
-        # decouple from parent environment
-        os.chdir("/")
-        os.setsid()
-        os.umask(0)
-        # fork second time
-        self._fork()
-
-        # redirect standard file descriptors
-        sys.stdout.flush()
-        sys.stderr.flush()
-        stdin = open(self.stdin, 'r')
-        stdout = open(self.stdout, 'a+')
-        stderr = open(self.stderr, 'a+', 0)
-        os.dup2(stdin.fileno(), sys.stdin.fileno())
-        os.dup2(stdout.fileno(), sys.stdout.fileno())
-        os.dup2(stderr.fileno(), sys.stderr.fileno())
-
-        signal.signal(signal.SIGTERM, self.handle_sigterm)
-
-    def handle_sigterm(self, signum, frame):
-        sys.exit(0)
-
-    def start(self):
-        """Start the daemon."""
-        self.daemonize()
-        self.run()
-
-    def run(self):
-        """Override this method when subclassing Daemon.
-
-        start() will call this method after the process has daemonized.
-        """
-        pass
-
-
-class MonitorNeutronAgentsDaemon(Daemon):
-    def __init__(self):
-        super(MonitorNeutronAgentsDaemon, self).__init__()
-        logging.setup('Neuron-HA-Monitor')
-        LOG.info('Monitor Neutron Agent Loop Init')
-        self.hostname = None
-        self.env = {}
-
-    def get_env(self):
-        envrc_f = '/etc/legacy_ha_envrc'
-        envrc_f_m = False
-        if os.path.isfile(envrc_f):
-            ctime = time.ctime(os.stat(envrc_f).st_ctime)
-            mtime = time.ctime(os.stat(envrc_f).st_mtime)
-            if ctime != mtime:
-                envrc_f_m = True
-
-            if not self.env or envrc_f_m:
-                with open(envrc_f, 'r') as f:
-                    for line in f:
-                        data = line.strip().split('=')
-                        if data and data[0] and data[1]:
-                            self.env[data[0]] = data[1]
-                        else:
-                            raise Exception("OpenStack env data uncomplete.")
-        return self.env
-
-    def get_hostname(self):
-        if not self.hostname:
-            self.hostname = socket.gethostname()
-        return self.hostname
-
-    def get_root_helper(self):
-        return 'sudo'
-
-    def list_monitor_res(self):
-        # List crm resource 'cl_monitor' running node
-        nodes = []
-        cmd = ['crm', 'resource', 'show', 'cl_monitor']
-        output = subprocess.check_output(cmd)
-        pattern = re.compile('resource cl_monitor is running on: (.*) ')
-        nodes = pattern.findall(output)
-        return nodes
-
-    def get_crm_res_lead_node(self):
-        nodes = self.list_monitor_res()
-        if nodes:
-            return nodes[0].strip()
-        else:
-            LOG.error('Failed to get crm resource.')
-            return None
-
-    def unplug_device(self, device):
-        try:
-            device.link.delete()
-        except RuntimeError:
-            root_helper = self.get_root_helper()
-            # Maybe the device is OVS port, so try to delete
-            bridge_name = ovs_lib.get_bridge_for_iface(root_helper,
-                                                       device.name)
-            if bridge_name:
-                bridge = ovs_lib.OVSBridge(bridge_name, root_helper)
-                bridge.delete_port(device.name)
-            else:
-                LOG.debug('Unable to find bridge for device: %s', device.name)
-
-    def get_pattern(self, key, text):
-        if not key or not text:
-            LOG.debug('Invalid key(%s) or text(%s)' % (key, text))
-            return None
-
-        pattern = re.compile('%s' % key)
-        result = pattern.findall(text)
-        return result
-
-    def _cleanup(self, key1, key2):
-        namespaces = []
-        if key1:
-            for k in key1.iterkeys():
-                namespaces.append(key2 + '-' + k)
-        else:
-            try:
-                cmd = ['sudo', 'ip', 'netns']
-                ns = subprocess.check_output(cmd)
-                namespaces = self.get_pattern('(%s.*)' % key2, ns)
-            except RuntimeError as e:
-                LOG.error('Failed to list namespace, (%s)' % e)
-
-        if namespaces:
-            LOG.info('Namespaces: %s is going to be deleted.' % namespaces)
-            self.destroy_namespaces(namespaces)
-
-    def cleanup_dhcp(self, networks):
-        self._cleanup(networks, 'qdhcp')
-
-    def cleanup_router(self, routers):
-        self._cleanup(routers, 'qrouter')
-
-    def destroy_namespaces(self, namespaces):
-        try:
-            root_helper = self.get_root_helper()
-            for namespace in namespaces:
-                ip = ip_lib.IPWrapper(root_helper, namespace)
-                if ip.netns.exists(namespace):
-                    for device in ip.get_devices(exclude_loopback=True):
-                        self.unplug_device(device)
-
-            ip.garbage_collect_namespace()
-        except Exception:
-            LOG.exception('Error unable to destroy namespace: %s', namespace)
-
-    def is_same_host(self, host):
-        return str(host).strip() == self.get_hostname()
-
-    def validate_reschedule(self):
-        crm_no_1_node = self.get_crm_res_lead_node()
-        if not crm_no_1_node:
-            LOG.error('No crm first node could be found.')
-            return False
-
-        if not self.is_same_host(crm_no_1_node):
-            LOG.warn('Only the first crm node %s could reschedule. '
-                     % crm_no_1_node)
-            return False
-        return True
-
-    def l3_agents_reschedule(self, l3_agents, routers, quantum):
-        if not self.validate_reschedule():
-            return
-
-        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]))
-            try:
-                quantum.remove_router_from_l3_agent(l3_agent=routers[router_id],
-                                                    router_id=router_id)
-            except exceptions.NeutronException as e:
-                LOG.error('Remove router raised exception: %s' % e)
-            try:
-                quantum.add_router_to_l3_agent(l3_agent=l3_agents[agent],
-                                               body={'router_id': router_id})
-            except exceptions.NeutronException as e:
-                LOG.error('Add router raised exception: %s' % e)
-            index += 1
-
-    def dhcp_agents_reschedule(self, dhcp_agents, networks, quantum):
-        if not self.validate_reschedule():
-            return
-
-        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]))
-            try:
-                quantum.remove_network_from_dhcp_agent(
-                    dhcp_agent=networks[network_id], network_id=network_id)
-            except exceptions.NeutronException as e:
-                LOG.error('Remove network raised exception: %s' % e)
-            try:
-                quantum.add_network_to_dhcp_agent(
-                    dhcp_agent=dhcp_agents[agent],
-                    body={'network_id': network_id})
-            except exceptions.NeutronException as e:
-                LOG.error('Add network raised exception: %s' % e)
-            index += 1
-
-    def get_quantum_client(self):
-        env = self.get_env()
-        if not env:
-            LOG.info('Unable to re-assign resources at this time')
-            return None
-
-        try:
-            from quantumclient.v2_0 import client
-        except ImportError:
-            # Try to import neutronclient instead for havana+
-            from neutronclient.v2_0 import client
-
-        auth_url = '%(auth_protocol)s://%(keystone_host)s:%(auth_port)s/v2.0' \
-                   % env
-        quantum = client.Client(username=env['service_username'],
-                                password=env['service_password'],
-                                tenant_name=env['service_tenant'],
-                                auth_url=auth_url,
-                                region_name=env['region'])
-        return quantum
-
-    def reassign_agent_resources(self, quantum=None):
-        """Use agent scheduler API to detect down agents and re-schedule"""
-        if not quantum:
-            LOG.error('Failed to get quantum client.')
-            return
-
-        try:
-            DHCP_AGENT = "DHCP Agent"
-            L3_AGENT = "L3 Agent"
-            agents = quantum.list_agents(agent_type=DHCP_AGENT)
-        except exceptions.NeutronException as e:
-            LOG.error('Failed to get quantum agents, %s' % e)
-            return
-
-        dhcp_agents = []
-        l3_agents = []
-        networks = {}
-        for agent in agents['agents']:
-            hosted_networks = quantum.list_networks_on_dhcp_agent(
-                agent['id'])['networks']
-            if not agent['alive']:
-                LOG.info('DHCP Agent %s down' % agent['id'])
-                for network in hosted_networks:
-                    networks[network['id']] = agent['id']
-                if self.is_same_host(agent['host']):
-                    self.cleanup_dhcp(networks)
-            else:
-                dhcp_agents.append(agent['id'])
-                LOG.info('Active dhcp agents: %s' % agent['id'])
-                if not hosted_networks and self.is_same_host(agent['host']):
-                    self.cleanup_dhcp(None)
-
-        agents = quantum.list_agents(agent_type=L3_AGENT)
-        routers = {}
-        for agent in agents['agents']:
-            hosted_routers = quantum.list_routers_on_l3_agent(
-                agent['id'])['routers']
-            if not agent['alive']:
-                LOG.info('L3 Agent %s down' % agent['id'])
-                for router in hosted_routers:
-                    routers[router['id']] = agent['id']
-                if self.is_same_host(agent['host']):
-                    self.cleanup_router(routers)
-            else:
-                l3_agents.append(agent['id'])
-                LOG.info('Active l3 agents: %s' % agent['id'])
-                if not hosted_routers and self.is_same_host(agent['host']):
-                    self.cleanup_router(None)
-
-        if not networks and not routers:
-            LOG.info('No networks and routers hosted on failed agents.')
-            return
-
-        if len(dhcp_agents) == 0 and len(l3_agents) == 0:
-            LOG.error('Unable to relocate resources, there are %s dhcp_agents '
-                      'and %s l3_agents in this cluster' % (len(dhcp_agents),
-                                                            len(l3_agents)))
-            return
-
-        if len(l3_agents) > 0:
-            self.l3_agents_reschedule(l3_agents, routers, quantum)
-            # new l3 node will not create a tunnel if don't restart ovs process
-
-        if len(dhcp_agents) > 0:
-            self.dhcp_agents_reschedule(dhcp_agents, networks, quantum)
-
-
-    def check_ovs_tunnel(self, quantum=None):
-        '''
-        Work around for Bug #1411163
-        No fdb entries added when failover dhcp and l3 agent together.
-        '''
-        if not quantum:
-            LOG.error('Failed to get quantum client.')
-            return
-
-        try:
-            OVS_AGENT = 'Open vSwitch agent'
-            agents = quantum.list_agents(agent_type=OVS_AGENT)
-        except exceptions.NeutronException as e:
-            LOG.error('No ovs agent found on localhost, error:%s.' % e)
-            return
-
-        for agent in agents['agents']:
-            if self.is_same_host(agent['host']) and agent['alive']:
-                conf = agent['configurations']
-                if 'gre' in conf['tunnel_types'] and conf['l2_population'] \
-                        and conf['devices']:
-                    LOG.debug('local ovs agent:%s' % agent)
-                    ovs_output = subprocess.check_output(['ovs-vsctl',
-                                                          'list-ports', 'br-tun'])
-                    ports = ovs_output.strip().split('\n')
-                    look_up_gre_port = False
-                    for port in ports:
-                        if port.startswith('gre-'):
-                            look_up_gre_port = True
-                            break
-                    if not look_up_gre_port:
-                        try:
-                            LOG.error('Local agent has devices, but no ovs tunnel is created,'
-                                      'restart ovs agent.')
-                            cmd = ['sudo', 'service', 'neutron-plugin-openvswitch-agent',
-                                   'restart']
-                            subprocess.call(cmd)
-                        except subprocess.CalledProcessError:
-                            LOG.error('Failed to restart neutron-plugin-openvswitch-agent.')
-
-    def check_local_agents(self):
-        services = ['openvswitch-switch', 'neutron-dhcp-agent',
-                    'neutron-metadata-agent', 'neutron-vpn-agent']
-        for s in services:
-            status = ['sudo', 'service', s, 'status']
-            restart = ['sudo', 'service', s, 'restart']
-            start = ['sudo', 'service', s, 'start']
-            stop = '%s stop/waiting' % s
-            try:
-                output = subprocess.check_output(status)
-                if output.strip() == stop:
-                    subprocess.check_output(start)
-                    LOG.error('Restart service: %s' % s)
-                    if s == 'neutron-metadata-agent':
-                        subprocess.check_output(['sudo', 'service',
-                                                 'neutron-vpn-agent',
-                                                 'restart'])
-                        LOG.error('Restart neutron-vpn-agent')
-            except subprocess.CalledProcessError:
-                LOG.error('Restart service: %s' % s)
-                subprocess.check_output(restart)
-                if s == 'neutron-metadata-agent':
-                    subprocess.check_output(['sudo', 'service',
-                                             'neutron-vpn-agent',
-                                             'restart'])
-
-    def run(self):
-        while True:
-            LOG.info('Monitor Neutron HA Agent Loop Start')
-            quantum = self.get_quantum_client()
-            self.reassign_agent_resources(quantum=quantum)
-            self.check_ovs_tunnel(quantum=quantum)
-            self.check_local_agents()
-            LOG.info('sleep %s' % cfg.CONF.check_interval)
-            time.sleep(float(cfg.CONF.check_interval))
-
-
-if __name__ == '__main__':
-    opts = [
-        cfg.StrOpt('check_interval',
-                   default=8,
-                   help='Check Neutron Agents interval.'),
-    ]
-
-    cfg.CONF.register_cli_opts(opts)
-    cfg.CONF(project='monitor_neutron_agents', default_config_files=[])
-    logging.setup('Neuron-HA-Monitor')
-    monitor_daemon = MonitorNeutronAgentsDaemon()
-    monitor_daemon.start()

=== removed symlink 'hooks/amqp-nova-relation-changed'
=== target was u'quantum_hooks.py'
=== removed symlink 'hooks/amqp-nova-relation-departed'
=== target was u'quantum_hooks.py'
=== removed symlink 'hooks/amqp-nova-relation-joined'
=== target was u'quantum_hooks.py'
=== removed symlink 'hooks/amqp-relation-changed'
=== target was u'quantum_hooks.py'
=== removed symlink 'hooks/amqp-relation-departed'
=== target was u'quantum_hooks.py'
=== removed symlink 'hooks/amqp-relation-joined'
=== target was u'quantum_hooks.py'
=== removed directory 'hooks/charmhelpers/contrib'
=== removed file 'hooks/charmhelpers/contrib/__init__.py'
--- hooks/charmhelpers/contrib/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.

=== removed directory 'hooks/charmhelpers/contrib/charmsupport'
=== removed file 'hooks/charmhelpers/contrib/charmsupport/__init__.py'
--- hooks/charmhelpers/contrib/charmsupport/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/charmsupport/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	2015-04-19 09:02:48 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	1970-01-01 00:00:00 +0000
@@ -1,360 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Compatibility with the nrpe-external-master charm"""
-# Copyright 2012 Canonical Ltd.
-#
-# Authors:
-#  Matthew Wedgwood <[e-mail]>
-
-import subprocess
-import pwd
-import grp
-import os
-import glob
-import shutil
-import re
-import shlex
-import yaml
-
-from charmhelpers.core.hookenv import (
-    config,
-    local_unit,
-    log,
-    relation_ids,
-    relation_set,
-    relations_of_type,
-)
-
-from charmhelpers.core.host import service
-
-# This module adds compatibility with the nrpe-external-master and plain nrpe
-# subordinate charms. To use it in your charm:
-#
-# 1. Update metadata.yaml
-#
-#   provides:
-#     (...)
-#     nrpe-external-master:
-#       interface: nrpe-external-master
-#       scope: container
-#
-#   and/or
-#
-#   provides:
-#     (...)
-#     local-monitors:
-#       interface: local-monitors
-#       scope: container
-
-#
-# 2. Add the following to config.yaml
-#
-#    nagios_context:
-#      default: "juju"
-#      type: string
-#      description: |
-#        Used by the nrpe subordinate charms.
-#        A string that will be prepended to instance name to set the host name
-#        in nagios. So for instance the hostname would be something like:
-#            juju-myservice-0
-#        If you're running multiple environments with the same services in them
-#        this allows you to differentiate between them.
-#    nagios_servicegroups:
-#      default: ""
-#      type: string
-#      description: |
-#        A comma-separated list of nagios servicegroups.
-#        If left empty, the nagios_context will be used as the servicegroup
-#
-# 3. Add custom checks (Nagios plugins) to files/nrpe-external-master
-#
-# 4. Update your hooks.py with something like this:
-#
-#    from charmsupport.nrpe import NRPE
-#    (...)
-#    def update_nrpe_config():
-#        nrpe_compat = NRPE()
-#        nrpe_compat.add_check(
-#            shortname = "myservice",
-#            description = "Check MyService",
-#            check_cmd = "check_http -w 2 -c 10 http://localhost"
-#            )
-#        nrpe_compat.add_check(
-#            "myservice_other",
-#            "Check for widget failures",
-#            check_cmd = "/srv/myapp/scripts/widget_check"
-#            )
-#        nrpe_compat.write()
-#
-#    def config_changed():
-#        (...)
-#        update_nrpe_config()
-#
-#    def nrpe_external_master_relation_changed():
-#        update_nrpe_config()
-#
-#    def local_monitors_relation_changed():
-#        update_nrpe_config()
-#
-# 5. ln -s hooks.py nrpe-external-master-relation-changed
-#    ln -s hooks.py local-monitors-relation-changed
-
-
-class CheckException(Exception):
-    pass
-
-
-class Check(object):
-    shortname_re = '[A-Za-z0-9-_]+$'
-    service_template = ("""
-#---------------------------------------------------
-# This file is Juju managed
-#---------------------------------------------------
-define service {{
-    use                             active-service
-    host_name                       {nagios_hostname}
-    service_description             {nagios_hostname}[{shortname}] """
-                        """{description}
-    check_command                   check_nrpe!{command}
-    servicegroups                   {nagios_servicegroup}
-}}
-""")
-
-    def __init__(self, shortname, description, check_cmd):
-        super(Check, self).__init__()
-        # XXX: could be better to calculate this from the service name
-        if not re.match(self.shortname_re, shortname):
-            raise CheckException("shortname must match {}".format(
-                Check.shortname_re))
-        self.shortname = shortname
-        self.command = "check_{}".format(shortname)
-        # Note: a set of invalid characters is defined by the
-        # Nagios server config
-        # The default is: illegal_object_name_chars=`~!$%^&*"|'<>?,()=
-        self.description = description
-        self.check_cmd = self._locate_cmd(check_cmd)
-
-    def _locate_cmd(self, check_cmd):
-        search_path = (
-            '/usr/lib/nagios/plugins',
-            '/usr/local/lib/nagios/plugins',
-        )
-        parts = shlex.split(check_cmd)
-        for path in search_path:
-            if os.path.exists(os.path.join(path, parts[0])):
-                command = os.path.join(path, parts[0])
-                if len(parts) > 1:
-                    command += " " + " ".join(parts[1:])
-                return command
-        log('Check command not found: {}'.format(parts[0]))
-        return ''
-
-    def write(self, nagios_context, hostname, nagios_servicegroups):
-        nrpe_check_file = '/etc/nagios/nrpe.d/{}.cfg'.format(
-            self.command)
-        with open(nrpe_check_file, 'w') as nrpe_check_config:
-            nrpe_check_config.write("# check {}\n".format(self.shortname))
-            nrpe_check_config.write("command[{}]={}\n".format(
-                self.command, self.check_cmd))
-
-        if not os.path.exists(NRPE.nagios_exportdir):
-            log('Not writing service config as {} is not accessible'.format(
-                NRPE.nagios_exportdir))
-        else:
-            self.write_service_config(nagios_context, hostname,
-                                      nagios_servicegroups)
-
-    def write_service_config(self, nagios_context, hostname,
-                             nagios_servicegroups):
-        for f in os.listdir(NRPE.nagios_exportdir):
-            if re.search('.*{}.cfg'.format(self.command), f):
-                os.remove(os.path.join(NRPE.nagios_exportdir, f))
-
-        templ_vars = {
-            'nagios_hostname': hostname,
-            'nagios_servicegroup': nagios_servicegroups,
-            'description': self.description,
-            'shortname': self.shortname,
-            'command': self.command,
-        }
-        nrpe_service_text = Check.service_template.format(**templ_vars)
-        nrpe_service_file = '{}/service__{}_{}.cfg'.format(
-            NRPE.nagios_exportdir, hostname, self.command)
-        with open(nrpe_service_file, 'w') as nrpe_service_config:
-            nrpe_service_config.write(str(nrpe_service_text))
-
-    def run(self):
-        subprocess.call(self.check_cmd)
-
-
-class NRPE(object):
-    nagios_logdir = '/var/log/nagios'
-    nagios_exportdir = '/var/lib/nagios/export'
-    nrpe_confdir = '/etc/nagios/nrpe.d'
-
-    def __init__(self, hostname=None):
-        super(NRPE, self).__init__()
-        self.config = config()
-        self.nagios_context = self.config['nagios_context']
-        if 'nagios_servicegroups' in self.config and self.config['nagios_servicegroups']:
-            self.nagios_servicegroups = self.config['nagios_servicegroups']
-        else:
-            self.nagios_servicegroups = self.nagios_context
-        self.unit_name = local_unit().replace('/', '-')
-        if hostname:
-            self.hostname = hostname
-        else:
-            self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
-        self.checks = []
-
-    def add_check(self, *args, **kwargs):
-        self.checks.append(Check(*args, **kwargs))
-
-    def write(self):
-        try:
-            nagios_uid = pwd.getpwnam('nagios').pw_uid
-            nagios_gid = grp.getgrnam('nagios').gr_gid
-        except:
-            log("Nagios user not set up, nrpe checks not updated")
-            return
-
-        if not os.path.exists(NRPE.nagios_logdir):
-            os.mkdir(NRPE.nagios_logdir)
-            os.chown(NRPE.nagios_logdir, nagios_uid, nagios_gid)
-
-        nrpe_monitors = {}
-        monitors = {"monitors": {"remote": {"nrpe": nrpe_monitors}}}
-        for nrpecheck in self.checks:
-            nrpecheck.write(self.nagios_context, self.hostname,
-                            self.nagios_servicegroups)
-            nrpe_monitors[nrpecheck.shortname] = {
-                "command": nrpecheck.command,
-            }
-
-        service('restart', 'nagios-nrpe-server')
-
-        monitor_ids = relation_ids("local-monitors") + \
-            relation_ids("nrpe-external-master")
-        for rid in monitor_ids:
-            relation_set(relation_id=rid, monitors=yaml.dump(monitors))
-
-
-def get_nagios_hostcontext(relation_name='nrpe-external-master'):
-    """
-    Query relation with nrpe subordinate, return the nagios_host_context
-
-    :param str relation_name: Name of relation nrpe sub joined to
-    """
-    for rel in relations_of_type(relation_name):
-        if 'nagios_hostname' in rel:
-            return rel['nagios_host_context']
-
-
-def get_nagios_hostname(relation_name='nrpe-external-master'):
-    """
-    Query relation with nrpe subordinate, return the nagios_hostname
-
-    :param str relation_name: Name of relation nrpe sub joined to
-    """
-    for rel in relations_of_type(relation_name):
-        if 'nagios_hostname' in rel:
-            return rel['nagios_hostname']
-
-
-def get_nagios_unit_name(relation_name='nrpe-external-master'):
-    """
-    Return the nagios unit name prepended with host_context if needed
-
-    :param str relation_name: Name of relation nrpe sub joined to
-    """
-    host_context = get_nagios_hostcontext(relation_name)
-    if host_context:
-        unit = "%s:%s" % (host_context, local_unit())
-    else:
-        unit = local_unit()
-    return unit
-
-
-def add_init_service_checks(nrpe, services, unit_name):
-    """
-    Add checks for each service in list
-
-    :param NRPE nrpe: NRPE object to add check to
-    :param list services: List of services to check
-    :param str unit_name: Unit name to use in check description
-    """
-    for svc in services:
-        upstart_init = '/etc/init/%s.conf' % svc
-        sysv_init = '/etc/init.d/%s' % svc
-        if os.path.exists(upstart_init):
-            nrpe.add_check(
-                shortname=svc,
-                description='process check {%s}' % unit_name,
-                check_cmd='check_upstart_job %s' % svc
-            )
-        elif os.path.exists(sysv_init):
-            cronpath = '/etc/cron.d/nagios-service-check-%s' % svc
-            cron_file = ('*/5 * * * * root '
-                         '/usr/local/lib/nagios/plugins/check_exit_status.pl '
-                         '-s /etc/init.d/%s status > '
-                         '/var/lib/nagios/service-check-%s.txt\n' % (svc,
-                                                                     svc)
-                         )
-            f = open(cronpath, 'w')
-            f.write(cron_file)
-            f.close()
-            nrpe.add_check(
-                shortname=svc,
-                description='process check {%s}' % unit_name,
-                check_cmd='check_status_file.py -f '
-                          '/var/lib/nagios/service-check-%s.txt' % svc,
-            )
-
-
-def copy_nrpe_checks():
-    """
-    Copy the nrpe checks into place
-
-    """
-    NAGIOS_PLUGINS = '/usr/local/lib/nagios/plugins'
-    nrpe_files_dir = os.path.join(os.getenv('CHARM_DIR'), 'hooks',
-                                  'charmhelpers', 'contrib', 'openstack',
-                                  'files')
-
-    if not os.path.exists(NAGIOS_PLUGINS):
-        os.makedirs(NAGIOS_PLUGINS)
-    for fname in glob.glob(os.path.join(nrpe_files_dir, "check_*")):
-        if os.path.isfile(fname):
-            shutil.copy2(fname,
-                         os.path.join(NAGIOS_PLUGINS, os.path.basename(fname)))
-
-
-def add_haproxy_checks(nrpe, unit_name):
-    """
-    Add checks for each service in list
-
-    :param NRPE nrpe: NRPE object to add check to
-    :param str unit_name: Unit name to use in check description
-    """
-    nrpe.add_check(
-        shortname='haproxy_servers',
-        description='Check HAProxy {%s}' % unit_name,
-        check_cmd='check_haproxy.sh')
-    nrpe.add_check(
-        shortname='haproxy_queue',
-        description='Check HAProxy queue depth {%s}' % unit_name,
-        check_cmd='check_haproxy_queue_depth.sh')

=== removed file 'hooks/charmhelpers/contrib/charmsupport/volumes.py'
--- hooks/charmhelpers/contrib/charmsupport/volumes.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/charmsupport/volumes.py	1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-'''
-Functions for managing volumes in juju units. One volume is supported per unit.
-Subordinates may have their own storage, provided it is on its own partition.
-
-Configuration stanzas::
-
-  volume-ephemeral:
-    type: boolean
-    default: true
-    description: >
-      If false, a volume is mounted as sepecified in "volume-map"
-      If true, ephemeral storage will be used, meaning that log data
-         will only exist as long as the machine. YOU HAVE BEEN WARNED.
-  volume-map:
-    type: string
-    default: {}
-    description: >
-      YAML map of units to device names, e.g:
-        "{ rsyslog/0: /dev/vdb, rsyslog/1: /dev/vdb }"
-      Service units will raise a configure-error if volume-ephemeral
-      is 'true' and no volume-map value is set. Use 'juju set' to set a
-      value and 'juju resolved' to complete configuration.
-
-Usage::
-
-    from charmsupport.volumes import configure_volume, VolumeConfigurationError
-    from charmsupport.hookenv import log, ERROR
-    def post_mount_hook():
-        stop_service('myservice')
-    def post_mount_hook():
-        start_service('myservice')
-
-    if __name__ == '__main__':
-        try:
-            configure_volume(before_change=pre_mount_hook,
-                             after_change=post_mount_hook)
-        except VolumeConfigurationError:
-            log('Storage could not be configured', ERROR)
-
-'''
-
-# XXX: Known limitations
-# - fstab is neither consulted nor updated
-
-import os
-from charmhelpers.core import hookenv
-from charmhelpers.core import host
-import yaml
-
-
-MOUNT_BASE = '/srv/juju/volumes'
-
-
-class VolumeConfigurationError(Exception):
-    '''Volume configuration data is missing or invalid'''
-    pass
-
-
-def get_config():
-    '''Gather and sanity-check volume configuration data'''
-    volume_config = {}
-    config = hookenv.config()
-
-    errors = False
-
-    if config.get('volume-ephemeral') in (True, 'True', 'true', 'Yes', 'yes'):
-        volume_config['ephemeral'] = True
-    else:
-        volume_config['ephemeral'] = False
-
-    try:
-        volume_map = yaml.safe_load(config.get('volume-map', '{}'))
-    except yaml.YAMLError as e:
-        hookenv.log("Error parsing YAML volume-map: {}".format(e),
-                    hookenv.ERROR)
-        errors = True
-    if volume_map is None:
-        # probably an empty string
-        volume_map = {}
-    elif not isinstance(volume_map, dict):
-        hookenv.log("Volume-map should be a dictionary, not {}".format(
-            type(volume_map)))
-        errors = True
-
-    volume_config['device'] = volume_map.get(os.environ['JUJU_UNIT_NAME'])
-    if volume_config['device'] and volume_config['ephemeral']:
-        # asked for ephemeral storage but also defined a volume ID
-        hookenv.log('A volume is defined for this unit, but ephemeral '
-                    'storage was requested', hookenv.ERROR)
-        errors = True
-    elif not volume_config['device'] and not volume_config['ephemeral']:
-        # asked for permanent storage but did not define volume ID
-        hookenv.log('Ephemeral storage was requested, but there is no volume '
-                    'defined for this unit.', hookenv.ERROR)
-        errors = True
-
-    unit_mount_name = hookenv.local_unit().replace('/', '-')
-    volume_config['mountpoint'] = os.path.join(MOUNT_BASE, unit_mount_name)
-
-    if errors:
-        return None
-    return volume_config
-
-
-def mount_volume(config):
-    if os.path.exists(config['mountpoint']):
-        if not os.path.isdir(config['mountpoint']):
-            hookenv.log('Not a directory: {}'.format(config['mountpoint']))
-            raise VolumeConfigurationError()
-    else:
-        host.mkdir(config['mountpoint'])
-    if os.path.ismount(config['mountpoint']):
-        unmount_volume(config)
-    if not host.mount(config['device'], config['mountpoint'], persist=True):
-        raise VolumeConfigurationError()
-
-
-def unmount_volume(config):
-    if os.path.ismount(config['mountpoint']):
-        if not host.umount(config['mountpoint'], persist=True):
-            raise VolumeConfigurationError()
-
-
-def managed_mounts():
-    '''List of all mounted managed volumes'''
-    return filter(lambda mount: mount[0].startswith(MOUNT_BASE), host.mounts())
-
-
-def configure_volume(before_change=lambda: None, after_change=lambda: None):
-    '''Set up storage (or don't) according to the charm's volume configuration.
-       Returns the mount point or "ephemeral". before_change and after_change
-       are optional functions to be called if the volume configuration changes.
-    '''
-
-    config = get_config()
-    if not config:
-        hookenv.log('Failed to read volume configuration', hookenv.CRITICAL)
-        raise VolumeConfigurationError()
-
-    if config['ephemeral']:
-        if os.path.ismount(config['mountpoint']):
-            before_change()
-            unmount_volume(config)
-            after_change()
-        return 'ephemeral'
-    else:
-        # persistent storage
-        if os.path.ismount(config['mountpoint']):
-            mounts = dict(managed_mounts())
-            if mounts.get(config['mountpoint']) != config['device']:
-                before_change()
-                unmount_volume(config)
-                mount_volume(config)
-                after_change()
-        else:
-            before_change()
-            mount_volume(config)
-            after_change()
-        return config['mountpoint']

=== removed directory 'hooks/charmhelpers/contrib/hahelpers'
=== removed file 'hooks/charmhelpers/contrib/hahelpers/__init__.py'
--- hooks/charmhelpers/contrib/hahelpers/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/hahelpers/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'hooks/charmhelpers/contrib/hahelpers/apache.py'
--- hooks/charmhelpers/contrib/hahelpers/apache.py	2015-02-24 12:07:07 +0000
+++ hooks/charmhelpers/contrib/hahelpers/apache.py	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Copyright 2012 Canonical Ltd.
-#
-# This file is sourced from lp:openstack-charm-helpers
-#
-# Authors:
-#  James Page <[e-mail]>
-#  Adam Gandelman <[e-mail]>
-#
-
-import subprocess
-
-from charmhelpers.core.hookenv import (
-    config as config_get,
-    relation_get,
-    relation_ids,
-    related_units as relation_list,
-    log,
-    INFO,
-)
-
-
-def get_cert(cn=None):
-    # TODO: deal with multiple https endpoints via charm config
-    cert = config_get('ssl_cert')
-    key = config_get('ssl_key')
-    if not (cert and key):
-        log("Inspecting identity-service relations for SSL certificate.",
-            level=INFO)
-        cert = key = None
-        if cn:
-            ssl_cert_attr = 'ssl_cert_{}'.format(cn)
-            ssl_key_attr = 'ssl_key_{}'.format(cn)
-        else:
-            ssl_cert_attr = 'ssl_cert'
-            ssl_key_attr = 'ssl_key'
-        for r_id in relation_ids('identity-service'):
-            for unit in relation_list(r_id):
-                if not cert:
-                    cert = relation_get(ssl_cert_attr,
-                                        rid=r_id, unit=unit)
-                if not key:
-                    key = relation_get(ssl_key_attr,
-                                       rid=r_id, unit=unit)
-    return (cert, key)
-
-
-def get_ca_cert():
-    ca_cert = config_get('ssl_ca')
-    if ca_cert is None:
-        log("Inspecting identity-service relations for CA SSL certificate.",
-            level=INFO)
-        for r_id in relation_ids('identity-service'):
-            for unit in relation_list(r_id):
-                if ca_cert is None:
-                    ca_cert = relation_get('ca_cert',
-                                           rid=r_id, unit=unit)
-    return ca_cert
-
-
-def install_ca_cert(ca_cert):
-    if ca_cert:
-        with open('/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt',
-                  'w') as crt:
-            crt.write(ca_cert)
-        subprocess.check_call(['update-ca-certificates', '--fresh'])

=== removed file 'hooks/charmhelpers/contrib/hahelpers/cluster.py'
--- hooks/charmhelpers/contrib/hahelpers/cluster.py	2015-03-31 15:13:53 +0000
+++ hooks/charmhelpers/contrib/hahelpers/cluster.py	1970-01-01 00:00:00 +0000
@@ -1,272 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-#
-# Copyright 2012 Canonical Ltd.
-#
-# Authors:
-#  James Page <[e-mail]>
-#  Adam Gandelman <[e-mail]>
-#
-
-"""
-Helpers for clustering and determining "cluster leadership" and other
-clustering-related helpers.
-"""
-
-import subprocess
-import os
-
-from socket import gethostname as get_unit_hostname
-
-import six
-
-from charmhelpers.core.hookenv import (
-    log,
-    relation_ids,
-    related_units as relation_list,
-    relation_get,
-    config as config_get,
-    INFO,
-    ERROR,
-    WARNING,
-    unit_get,
-)
-from charmhelpers.core.decorators import (
-    retry_on_exception,
-)
-from charmhelpers.core.strutils import (
-    bool_from_string,
-)
-
-
-class HAIncompleteConfig(Exception):
-    pass
-
-
-class CRMResourceNotFound(Exception):
-    pass
-
-
-def is_elected_leader(resource):
-    """
-    Returns True if the charm executing this is the elected cluster leader.
-
-    It relies on two mechanisms to determine leadership:
-        1. If the charm is part of a corosync cluster, call corosync to
-        determine leadership.
-        2. If the charm is not part of a corosync cluster, the leader is
-        determined as being "the alive unit with the lowest unit numer". In
-        other words, the oldest surviving unit.
-    """
-    if is_clustered():
-        if not is_crm_leader(resource):
-            log('Deferring action to CRM leader.', level=INFO)
-            return False
-    else:
-        peers = peer_units()
-        if peers and not oldest_peer(peers):
-            log('Deferring action to oldest service unit.', level=INFO)
-            return False
-    return True
-
-
-def is_clustered():
-    for r_id in (relation_ids('ha') or []):
-        for unit in (relation_list(r_id) or []):
-            clustered = relation_get('clustered',
-                                     rid=r_id,
-                                     unit=unit)
-            if clustered:
-                return True
-    return False
-
-
-@retry_on_exception(5, base_delay=2, exc_type=CRMResourceNotFound)
-def is_crm_leader(resource, retry=False):
-    """
-    Returns True if the charm calling this is the elected corosync leader,
-    as returned by calling the external "crm" command.
-
-    We allow this operation to be retried to avoid the possibility of getting a
-    false negative. See LP #1396246 for more info.
-    """
-    cmd = ['crm', 'resource', 'show', resource]
-    try:
-        status = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
-        if not isinstance(status, six.text_type):
-            status = six.text_type(status, "utf-8")
-    except subprocess.CalledProcessError:
-        status = None
-
-    if status and get_unit_hostname() in status:
-        return True
-
-    if status and "resource %s is NOT running" % (resource) in status:
-        raise CRMResourceNotFound("CRM resource %s not found" % (resource))
-
-    return False
-
-
-def is_leader(resource):
-    log("is_leader is deprecated. Please consider using is_crm_leader "
-        "instead.", level=WARNING)
-    return is_crm_leader(resource)
-
-
-def peer_units(peer_relation="cluster"):
-    peers = []
-    for r_id in (relation_ids(peer_relation) or []):
-        for unit in (relation_list(r_id) or []):
-            peers.append(unit)
-    return peers
-
-
-def peer_ips(peer_relation='cluster', addr_key='private-address'):
-    '''Return a dict of peers and their private-address'''
-    peers = {}
-    for r_id in relation_ids(peer_relation):
-        for unit in relation_list(r_id):
-            peers[unit] = relation_get(addr_key, rid=r_id, unit=unit)
-    return peers
-
-
-def oldest_peer(peers):
-    """Determines who the oldest peer is by comparing unit numbers."""
-    local_unit_no = int(os.getenv('JUJU_UNIT_NAME').split('/')[1])
-    for peer in peers:
-        remote_unit_no = int(peer.split('/')[1])
-        if remote_unit_no < local_unit_no:
-            return False
-    return True
-
-
-def eligible_leader(resource):
-    log("eligible_leader is deprecated. Please consider using "
-        "is_elected_leader instead.", level=WARNING)
-    return is_elected_leader(resource)
-
-
-def https():
-    '''
-    Determines whether enough data has been provided in configuration
-    or relation data to configure HTTPS
-    .
-    returns: boolean
-    '''
-    use_https = config_get('use-https')
-    if use_https and bool_from_string(use_https):
-        return True
-    if config_get('ssl_cert') and config_get('ssl_key'):
-        return True
-    for r_id in relation_ids('identity-service'):
-        for unit in relation_list(r_id):
-            # TODO - needs fixing for new helper as ssl_cert/key suffixes with CN
-            rel_state = [
-                relation_get('https_keystone', rid=r_id, unit=unit),
-                relation_get('ca_cert', rid=r_id, unit=unit),
-            ]
-            # NOTE: works around (LP: #1203241)
-            if (None not in rel_state) and ('' not in rel_state):
-                return True
-    return False
-
-
-def determine_api_port(public_port, singlenode_mode=False):
-    '''
-    Determine correct API server listening port based on
-    existence of HTTPS reverse proxy and/or haproxy.
-
-    public_port: int: standard public port for given service
-
-    singlenode_mode: boolean: Shuffle ports when only a single unit is present
-
-    returns: int: the correct listening port for the API service
-    '''
-    i = 0
-    if singlenode_mode:
-        i += 1
-    elif len(peer_units()) > 0 or is_clustered():
-        i += 1
-    if https():
-        i += 1
-    return public_port - (i * 10)
-
-
-def determine_apache_port(public_port, singlenode_mode=False):
-    '''
-    Description: Determine correct apache listening port based on public IP +
-    state of the cluster.
-
-    public_port: int: standard public port for given service
-
-    singlenode_mode: boolean: Shuffle ports when only a single unit is present
-
-    returns: int: the correct listening port for the HAProxy service
-    '''
-    i = 0
-    if singlenode_mode:
-        i += 1
-    elif len(peer_units()) > 0 or is_clustered():
-        i += 1
-    return public_port - (i * 10)
-
-
-def get_hacluster_config(exclude_keys=None):
-    '''
-    Obtains all relevant configuration from charm configuration required
-    for initiating a relation to hacluster:
-
-        ha-bindiface, ha-mcastport, vip
-
-    param: exclude_keys: list of setting key(s) to be excluded.
-    returns: dict: A dict containing settings keyed by setting name.
-    raises: HAIncompleteConfig if settings are missing.
-    '''
-    settings = ['ha-bindiface', 'ha-mcastport', 'vip']
-    conf = {}
-    for setting in settings:
-        if exclude_keys and setting in exclude_keys:
-            continue
-
-        conf[setting] = config_get(setting)
-    missing = []
-    [missing.append(s) for s, v in six.iteritems(conf) if v is None]
-    if missing:
-        log('Insufficient config data to configure hacluster.', level=ERROR)
-        raise HAIncompleteConfig
-    return conf
-
-
-def canonical_url(configs, vip_setting='vip'):
-    '''
-    Returns the correct HTTP URL to this host given the state of HTTPS
-    configuration and hacluster.
-
-    :configs    : OSTemplateRenderer: A config tempating object to inspect for
-                                      a complete https context.
-
-    :vip_setting:                str: Setting in charm config that specifies
-                                      VIP address.
-    '''
-    scheme = 'http'
-    if 'https' in configs.complete_contexts():
-        scheme = 'https'
-    if is_clustered():
-        addr = config_get(vip_setting)
-    else:
-        addr = unit_get('private-address')
-    return '%s://%s' % (scheme, addr)

=== removed directory 'hooks/charmhelpers/contrib/network'
=== removed file 'hooks/charmhelpers/contrib/network/__init__.py'
--- hooks/charmhelpers/contrib/network/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/network/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'hooks/charmhelpers/contrib/network/ip.py'
--- hooks/charmhelpers/contrib/network/ip.py	2015-03-31 15:13:53 +0000
+++ hooks/charmhelpers/contrib/network/ip.py	1970-01-01 00:00:00 +0000
@@ -1,450 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-import glob
-import re
-import subprocess
-import six
-import socket
-
-from functools import partial
-
-from charmhelpers.core.hookenv import unit_get
-from charmhelpers.fetch import apt_install
-from charmhelpers.core.hookenv import (
-    log,
-    WARNING,
-)
-
-try:
-    import netifaces
-except ImportError:
-    apt_install('python-netifaces')
-    import netifaces
-
-try:
-    import netaddr
-except ImportError:
-    apt_install('python-netaddr')
-    import netaddr
-
-
-def _validate_cidr(network):
-    try:
-        netaddr.IPNetwork(network)
-    except (netaddr.core.AddrFormatError, ValueError):
-        raise ValueError("Network (%s) is not in CIDR presentation format" %
-                         network)
-
-
-def no_ip_found_error_out(network):
-    errmsg = ("No IP address found in network: %s" % network)
-    raise ValueError(errmsg)
-
-
-def get_address_in_network(network, fallback=None, fatal=False):
-    """Get an IPv4 or IPv6 address within the network from the host.
-
-    :param network (str): CIDR presentation format. For example,
-        '192.168.1.0/24'.
-    :param fallback (str): If no address is found, return fallback.
-    :param fatal (boolean): If no address is found, fallback is not
-        set and fatal is True then exit(1).
-    """
-    if network is None:
-        if fallback is not None:
-            return fallback
-
-        if fatal:
-            no_ip_found_error_out(network)
-        else:
-            return None
-
-    _validate_cidr(network)
-    network = netaddr.IPNetwork(network)
-    for iface in netifaces.interfaces():
-        addresses = netifaces.ifaddresses(iface)
-        if network.version == 4 and netifaces.AF_INET in addresses:
-            addr = addresses[netifaces.AF_INET][0]['addr']
-            netmask = addresses[netifaces.AF_INET][0]['netmask']
-            cidr = netaddr.IPNetwork("%s/%s" % (addr, netmask))
-            if cidr in network:
-                return str(cidr.ip)
-
-        if network.version == 6 and netifaces.AF_INET6 in addresses:
-            for addr in addresses[netifaces.AF_INET6]:
-                if not addr['addr'].startswith('fe80'):
-                    cidr = netaddr.IPNetwork("%s/%s" % (addr['addr'],
-                                                        addr['netmask']))
-                    if cidr in network:
-                        return str(cidr.ip)
-
-    if fallback is not None:
-        return fallback
-
-    if fatal:
-        no_ip_found_error_out(network)
-
-    return None
-
-
-def is_ipv6(address):
-    """Determine whether provided address is IPv6 or not."""
-    try:
-        address = netaddr.IPAddress(address)
-    except netaddr.AddrFormatError:
-        # probably a hostname - so not an address at all!
-        return False
-
-    return address.version == 6
-
-
-def is_address_in_network(network, address):
-    """
-    Determine whether the provided address is within a network range.
-
-    :param network (str): CIDR presentation format. For example,
-        '192.168.1.0/24'.
-    :param address: An individual IPv4 or IPv6 address without a net
-        mask or subnet prefix. For example, '192.168.1.1'.
-    :returns boolean: Flag indicating whether address is in network.
-    """
-    try:
-        network = netaddr.IPNetwork(network)
-    except (netaddr.core.AddrFormatError, ValueError):
-        raise ValueError("Network (%s) is not in CIDR presentation format" %
-                         network)
-
-    try:
-        address = netaddr.IPAddress(address)
-    except (netaddr.core.AddrFormatError, ValueError):
-        raise ValueError("Address (%s) is not in correct presentation format" %
-                         address)
-
-    if address in network:
-        return True
-    else:
-        return False
-
-
-def _get_for_address(address, key):
-    """Retrieve an attribute of or the physical interface that
-    the IP address provided could be bound to.
-
-    :param address (str): An individual IPv4 or IPv6 address without a net
-        mask or subnet prefix. For example, '192.168.1.1'.
-    :param key: 'iface' for the physical interface name or an attribute
-        of the configured interface, for example 'netmask'.
-    :returns str: Requested attribute or None if address is not bindable.
-    """
-    address = netaddr.IPAddress(address)
-    for iface in netifaces.interfaces():
-        addresses = netifaces.ifaddresses(iface)
-        if address.version == 4 and netifaces.AF_INET in addresses:
-            addr = addresses[netifaces.AF_INET][0]['addr']
-            netmask = addresses[netifaces.AF_INET][0]['netmask']
-            network = netaddr.IPNetwork("%s/%s" % (addr, netmask))
-            cidr = network.cidr
-            if address in cidr:
-                if key == 'iface':
-                    return iface
-                else:
-                    return addresses[netifaces.AF_INET][0][key]
-
-        if address.version == 6 and netifaces.AF_INET6 in addresses:
-            for addr in addresses[netifaces.AF_INET6]:
-                if not addr['addr'].startswith('fe80'):
-                    network = netaddr.IPNetwork("%s/%s" % (addr['addr'],
-                                                           addr['netmask']))
-                    cidr = network.cidr
-                    if address in cidr:
-                        if key == 'iface':
-                            return iface
-                        elif key == 'netmask' and cidr:
-                            return str(cidr).split('/')[1]
-                        else:
-                            return addr[key]
-
-    return None
-
-
-get_iface_for_address = partial(_get_for_address, key='iface')
-
-
-get_netmask_for_address = partial(_get_for_address, key='netmask')
-
-
-def format_ipv6_addr(address):
-    """If address is IPv6, wrap it in '[]' otherwise return None.
-
-    This is required by most configuration files when specifying IPv6
-    addresses.
-    """
-    if is_ipv6(address):
-        return "[%s]" % address
-
-    return None
-
-
-def get_iface_addr(iface='eth0', inet_type='AF_INET', inc_aliases=False,
-                   fatal=True, exc_list=None):
-    """Return the assigned IP address for a given interface, if any."""
-    # Extract nic if passed /dev/ethX
-    if '/' in iface:
-        iface = iface.split('/')[-1]
-
-    if not exc_list:
-        exc_list = []
-
-    try:
-        inet_num = getattr(netifaces, inet_type)
-    except AttributeError:
-        raise Exception("Unknown inet type '%s'" % str(inet_type))
-
-    interfaces = netifaces.interfaces()
-    if inc_aliases:
-        ifaces = []
-        for _iface in interfaces:
-            if iface == _iface or _iface.split(':')[0] == iface:
-                ifaces.append(_iface)
-
-        if fatal and not ifaces:
-            raise Exception("Invalid interface '%s'" % iface)
-
-        ifaces.sort()
-    else:
-        if iface not in interfaces:
-            if fatal:
-                raise Exception("Interface '%s' not found " % (iface))
-            else:
-                return []
-
-        else:
-            ifaces = [iface]
-
-    addresses = []
-    for netiface in ifaces:
-        net_info = netifaces.ifaddresses(netiface)
-        if inet_num in net_info:
-            for entry in net_info[inet_num]:
-                if 'addr' in entry and entry['addr'] not in exc_list:
-                    addresses.append(entry['addr'])
-
-    if fatal and not addresses:
-        raise Exception("Interface '%s' doesn't have any %s addresses." %
-                        (iface, inet_type))
-
-    return sorted(addresses)
-
-
-get_ipv4_addr = partial(get_iface_addr, inet_type='AF_INET')
-
-
-def get_iface_from_addr(addr):
-    """Work out on which interface the provided address is configured."""
-    for iface in netifaces.interfaces():
-        addresses = netifaces.ifaddresses(iface)
-        for inet_type in addresses:
-            for _addr in addresses[inet_type]:
-                _addr = _addr['addr']
-                # link local
-                ll_key = re.compile("(.+)%.*")
-                raw = re.match(ll_key, _addr)
-                if raw:
-                    _addr = raw.group(1)
-
-                if _addr == addr:
-                    log("Address '%s' is configured on iface '%s'" %
-                        (addr, iface))
-                    return iface
-
-    msg = "Unable to infer net iface on which '%s' is configured" % (addr)
-    raise Exception(msg)
-
-
-def sniff_iface(f):
-    """Ensure decorated function is called with a value for iface.
-
-    If no iface provided, inject net iface inferred from unit private address.
-    """
-    def iface_sniffer(*args, **kwargs):
-        if not kwargs.get('iface', None):
-            kwargs['iface'] = get_iface_from_addr(unit_get('private-address'))
-
-        return f(*args, **kwargs)
-
-    return iface_sniffer
-
-
-@sniff_iface
-def get_ipv6_addr(iface=None, inc_aliases=False, fatal=True, exc_list=None,
-                  dynamic_only=True):
-    """Get assigned IPv6 address for a given interface.
-
-    Returns list of addresses found. If no address found, returns empty list.
-
-    If iface is None, we infer the current primary interface by doing a reverse
-    lookup on the unit private-address.
-
-    We currently only support scope global IPv6 addresses i.e. non-temporary
-    addresses. If no global IPv6 address is found, return the first one found
-    in the ipv6 address list.
-    """
-    addresses = get_iface_addr(iface=iface, inet_type='AF_INET6',
-                               inc_aliases=inc_aliases, fatal=fatal,
-                               exc_list=exc_list)
-
-    if addresses:
-        global_addrs = []
-        for addr in addresses:
-            key_scope_link_local = re.compile("^fe80::..(.+)%(.+)")
-            m = re.match(key_scope_link_local, addr)
-            if m:
-                eui_64_mac = m.group(1)
-                iface = m.group(2)
-            else:
-                global_addrs.append(addr)
-
-        if global_addrs:
-            # Make sure any found global addresses are not temporary
-            cmd = ['ip', 'addr', 'show', iface]
-            out = subprocess.check_output(cmd).decode('UTF-8')
-            if dynamic_only:
-                key = re.compile("inet6 (.+)/[0-9]+ scope global dynamic.*")
-            else:
-                key = re.compile("inet6 (.+)/[0-9]+ scope global.*")
-
-            addrs = []
-            for line in out.split('\n'):
-                line = line.strip()
-                m = re.match(key, line)
-                if m and 'temporary' not in line:
-                    # Return the first valid address we find
-                    for addr in global_addrs:
-                        if m.group(1) == addr:
-                            if not dynamic_only or \
-                                    m.group(1).endswith(eui_64_mac):
-                                addrs.append(addr)
-
-            if addrs:
-                return addrs
-
-    if fatal:
-        raise Exception("Interface '%s' does not have a scope global "
-                        "non-temporary ipv6 address." % iface)
-
-    return []
-
-
-def get_bridges(vnic_dir='/sys/devices/virtual/net'):
-    """Return a list of bridges on the system."""
-    b_regex = "%s/*/bridge" % vnic_dir
-    return [x.replace(vnic_dir, '').split('/')[1] for x in glob.glob(b_regex)]
-
-
-def get_bridge_nics(bridge, vnic_dir='/sys/devices/virtual/net'):
-    """Return a list of nics comprising a given bridge on the system."""
-    brif_regex = "%s/%s/brif/*" % (vnic_dir, bridge)
-    return [x.split('/')[-1] for x in glob.glob(brif_regex)]
-
-
-def is_bridge_member(nic):
-    """Check if a given nic is a member of a bridge."""
-    for bridge in get_bridges():
-        if nic in get_bridge_nics(bridge):
-            return True
-
-    return False
-
-
-def is_ip(address):
-    """
-    Returns True if address is a valid IP address.
-    """
-    try:
-        # Test to see if already an IPv4 address
-        socket.inet_aton(address)
-        return True
-    except socket.error:
-        return False
-
-
-def ns_query(address):
-    try:
-        import dns.resolver
-    except ImportError:
-        apt_install('python-dnspython')
-        import dns.resolver
-
-    if isinstance(address, dns.name.Name):
-        rtype = 'PTR'
-    elif isinstance(address, six.string_types):
-        rtype = 'A'
-    else:
-        return None
-
-    answers = dns.resolver.query(address, rtype)
-    if answers:
-        return str(answers[0])
-    return None
-
-
-def get_host_ip(hostname, fallback=None):
-    """
-    Resolves the IP for a given hostname, or returns
-    the input if it is already an IP.
-    """
-    if is_ip(hostname):
-        return hostname
-
-    ip_addr = ns_query(hostname)
-    if not ip_addr:
-        try:
-            ip_addr = socket.gethostbyname(hostname)
-        except:
-            log("Failed to resolve hostname '%s'" % (hostname),
-                level=WARNING)
-            return fallback
-    return ip_addr
-
-
-def get_hostname(address, fqdn=True):
-    """
-    Resolves hostname for given IP, or returns the input
-    if it is already a hostname.
-    """
-    if is_ip(address):
-        try:
-            import dns.reversename
-        except ImportError:
-            apt_install("python-dnspython")
-            import dns.reversename
-
-        rev = dns.reversename.from_address(address)
-        result = ns_query(rev)
-        if not result:
-            return None
-    else:
-        result = address
-
-    if fqdn:
-        # strip trailing .
-        if result.endswith('.'):
-            return result[:-1]
-        else:
-            return result
-    else:
-        return result.split('.')[0]

=== removed directory 'hooks/charmhelpers/contrib/network/ovs'
=== removed file 'hooks/charmhelpers/contrib/network/ovs/__init__.py'
--- hooks/charmhelpers/contrib/network/ovs/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/network/ovs/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-''' Helpers for interacting with OpenvSwitch '''
-import subprocess
-import os
-from charmhelpers.core.hookenv import (
-    log, WARNING
-)
-from charmhelpers.core.host import (
-    service
-)
-
-
-def add_bridge(name):
-    ''' Add the named bridge to openvswitch '''
-    log('Creating bridge {}'.format(name))
-    subprocess.check_call(["ovs-vsctl", "--", "--may-exist", "add-br", name])
-
-
-def del_bridge(name):
-    ''' Delete the named bridge from openvswitch '''
-    log('Deleting bridge {}'.format(name))
-    subprocess.check_call(["ovs-vsctl", "--", "--if-exists", "del-br", name])
-
-
-def add_bridge_port(name, port, promisc=False):
-    ''' Add a port to the named openvswitch bridge '''
-    log('Adding port {} to bridge {}'.format(port, name))
-    subprocess.check_call(["ovs-vsctl", "--", "--may-exist", "add-port",
-                           name, port])
-    subprocess.check_call(["ip", "link", "set", port, "up"])
-    if promisc:
-        subprocess.check_call(["ip", "link", "set", port, "promisc", "on"])
-    else:
-        subprocess.check_call(["ip", "link", "set", port, "promisc", "off"])
-
-
-def del_bridge_port(name, port):
-    ''' Delete a port from the named openvswitch bridge '''
-    log('Deleting port {} from bridge {}'.format(port, name))
-    subprocess.check_call(["ovs-vsctl", "--", "--if-exists", "del-port",
-                           name, port])
-    subprocess.check_call(["ip", "link", "set", port, "down"])
-    subprocess.check_call(["ip", "link", "set", port, "promisc", "off"])
-
-
-def set_manager(manager):
-    ''' Set the controller for the local openvswitch '''
-    log('Setting manager for local ovs to {}'.format(manager))
-    subprocess.check_call(['ovs-vsctl', 'set-manager',
-                           'ssl:{}'.format(manager)])
-
-
-CERT_PATH = '/etc/openvswitch/ovsclient-cert.pem'
-
-
-def get_certificate():
-    ''' Read openvswitch certificate from disk '''
-    if os.path.exists(CERT_PATH):
-        log('Reading ovs certificate from {}'.format(CERT_PATH))
-        with open(CERT_PATH, 'r') as cert:
-            full_cert = cert.read()
-            begin_marker = "-----BEGIN CERTIFICATE-----"
-            end_marker = "-----END CERTIFICATE-----"
-            begin_index = full_cert.find(begin_marker)
-            end_index = full_cert.rfind(end_marker)
-            if end_index == -1 or begin_index == -1:
-                raise RuntimeError("Certificate does not contain valid begin"
-                                   " and end markers.")
-            full_cert = full_cert[begin_index:(end_index + len(end_marker))]
-            return full_cert
-    else:
-        log('Certificate not found', level=WARNING)
-        return None
-
-
-def full_restart():
-    ''' Full restart and reload of openvswitch '''
-    if os.path.exists('/etc/init/openvswitch-force-reload-kmod.conf'):
-        service('start', 'openvswitch-force-reload-kmod')
-    else:
-        service('force-reload-kmod', 'openvswitch-switch')

=== removed file 'hooks/charmhelpers/contrib/network/ufw.py'
--- hooks/charmhelpers/contrib/network/ufw.py	2015-03-23 18:25:01 +0000
+++ hooks/charmhelpers/contrib/network/ufw.py	1970-01-01 00:00:00 +0000
@@ -1,276 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-This module contains helpers to add and remove ufw rules.
-
-Examples:
-
-- open SSH port for subnet 10.0.3.0/24:
-
-  >>> from charmhelpers.contrib.network import ufw
-  >>> ufw.enable()
-  >>> ufw.grant_access(src='10.0.3.0/24', dst='any', port='22', proto='tcp')
-
-- open service by name as defined in /etc/services:
-
-  >>> from charmhelpers.contrib.network import ufw
-  >>> ufw.enable()
-  >>> ufw.service('ssh', 'open')
-
-- close service by port number:
-
-  >>> from charmhelpers.contrib.network import ufw
-  >>> ufw.enable()
-  >>> ufw.service('4949', 'close')  # munin
-"""
-import re
-import os
-import subprocess
-from charmhelpers.core import hookenv
-
-__author__ = "Felipe Reyes <[e-mail]>"
-
-
-class UFWError(Exception):
-    pass
-
-
-class UFWIPv6Error(UFWError):
-    pass
-
-
-def is_enabled():
-    """
-    Check if `ufw` is enabled
-
-    :returns: True if ufw is enabled
-    """
-    output = subprocess.check_output(['ufw', 'status'],
-                                     universal_newlines=True,
-                                     env={'LANG': 'en_US',
-                                          'PATH': os.environ['PATH']})
-
-    m = re.findall(r'^Status: active\n', output, re.M)
-
-    return len(m) >= 1
-
-
-def is_ipv6_ok(soft_fail=False):
-    """
-    Check if IPv6 support is present and ip6tables functional
-
-    :param soft_fail: If set to True and IPv6 support is broken, then reports
-                      that the host doesn't have IPv6 support, otherwise a
-                      UFWIPv6Error exception is raised.
-    :returns: True if IPv6 is working, False otherwise
-    """
-
-    # do we have IPv6 in the machine?
-    if os.path.isdir('/proc/sys/net/ipv6'):
-        # is ip6tables kernel module loaded?
-        lsmod = subprocess.check_output(['lsmod'], universal_newlines=True)
-        matches = re.findall('^ip6_tables[ ]+', lsmod, re.M)
-        if len(matches) == 0:
-            # ip6tables support isn't complete, let's try to load it
-            try:
-                subprocess.check_output(['modprobe', 'ip6_tables'],
-                                        universal_newlines=True)
-                # great, we could load the module
-                return True
-            except subprocess.CalledProcessError as ex:
-                hookenv.log("Couldn't load ip6_tables module: %s" % ex.output,
-                            level="WARN")
-                # we are in a world where ip6tables isn't working
-                if soft_fail:
-                    # so we inform that the machine doesn't have IPv6
-                    return False
-                else:
-                    raise UFWIPv6Error("IPv6 firewall support broken")
-        else:
-            # the module is present :)
-            return True
-
-    else:
-        # the system doesn't have IPv6
-        return False
-
-
-def disable_ipv6():
-    """
-    Disable ufw IPv6 support in /etc/default/ufw
-    """
-    exit_code = subprocess.call(['sed', '-i', 's/IPV6=.*/IPV6=no/g',
-                                 '/etc/default/ufw'])
-    if exit_code == 0:
-        hookenv.log('IPv6 support in ufw disabled', level='INFO')
-    else:
-        hookenv.log("Couldn't disable IPv6 support in ufw", level="ERROR")
-        raise UFWError("Couldn't disable IPv6 support in ufw")
-
-
-def enable(soft_fail=False):
-    """
-    Enable ufw
-
-    :param soft_fail: If set to True silently disables IPv6 support in ufw,
-                      otherwise a UFWIPv6Error exception is raised when IP6
-                      support is broken.
-    :returns: True if ufw is successfully enabled
-    """
-    if is_enabled():
-        return True
-
-    if not is_ipv6_ok(soft_fail):
-        disable_ipv6()
-
-    output = subprocess.check_output(['ufw', 'enable'],
-                                     universal_newlines=True,
-                                     env={'LANG': 'en_US',
-                                          'PATH': os.environ['PATH']})
-
-    m = re.findall('^Firewall is active and enabled on system startup\n',
-                   output, re.M)
-    hookenv.log(output, level='DEBUG')
-
-    if len(m) == 0:
-        hookenv.log("ufw couldn't be enabled", level='WARN')
-        return False
-    else:
-        hookenv.log("ufw enabled", level='INFO')
-        return True
-
-
-def disable():
-    """
-    Disable ufw
-
-    :returns: True if ufw is successfully disabled
-    """
-    if not is_enabled():
-        return True
-
-    output = subprocess.check_output(['ufw', 'disable'],
-                                     universal_newlines=True,
-                                     env={'LANG': 'en_US',
-                                          'PATH': os.environ['PATH']})
-
-    m = re.findall(r'^Firewall stopped and disabled on system startup\n',
-                   output, re.M)
-    hookenv.log(output, level='DEBUG')
-
-    if len(m) == 0:
-        hookenv.log("ufw couldn't be disabled", level='WARN')
-        return False
-    else:
-        hookenv.log("ufw disabled", level='INFO')
-        return True
-
-
-def modify_access(src, dst='any', port=None, proto=None, action='allow'):
-    """
-    Grant access to an address or subnet
-
-    :param src: address (e.g. 192.168.1.234) or subnet
-                (e.g. 192.168.1.0/24).
-    :param dst: destiny of the connection, if the machine has multiple IPs and
-                connections to only one of those have to accepted this is the
-                field has to be set.
-    :param port: destiny port
-    :param proto: protocol (tcp or udp)
-    :param action: `allow` or `delete`
-    """
-    if not is_enabled():
-        hookenv.log('ufw is disabled, skipping modify_access()', level='WARN')
-        return
-
-    if action == 'delete':
-        cmd = ['ufw', 'delete', 'allow']
-    else:
-        cmd = ['ufw', action]
-
-    if src is not None:
-        cmd += ['from', src]
-
-    if dst is not None:
-        cmd += ['to', dst]
-
-    if port is not None:
-        cmd += ['port', str(port)]
-
-    if proto is not None:
-        cmd += ['proto', proto]
-
-    hookenv.log('ufw {}: {}'.format(action, ' '.join(cmd)), level='DEBUG')
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
-    (stdout, stderr) = p.communicate()
-
-    hookenv.log(stdout, level='INFO')
-
-    if p.returncode != 0:
-        hookenv.log(stderr, level='ERROR')
-        hookenv.log('Error running: {}, exit code: {}'.format(' '.join(cmd),
-                                                              p.returncode),
-                    level='ERROR')
-
-
-def grant_access(src, dst='any', port=None, proto=None):
-    """
-    Grant access to an address or subnet
-
-    :param src: address (e.g. 192.168.1.234) or subnet
-                (e.g. 192.168.1.0/24).
-    :param dst: destiny of the connection, if the machine has multiple IPs and
-                connections to only one of those have to accepted this is the
-                field has to be set.
-    :param port: destiny port
-    :param proto: protocol (tcp or udp)
-    """
-    return modify_access(src, dst=dst, port=port, proto=proto, action='allow')
-
-
-def revoke_access(src, dst='any', port=None, proto=None):
-    """
-    Revoke access to an address or subnet
-
-    :param src: address (e.g. 192.168.1.234) or subnet
-                (e.g. 192.168.1.0/24).
-    :param dst: destiny of the connection, if the machine has multiple IPs and
-                connections to only one of those have to accepted this is the
-                field has to be set.
-    :param port: destiny port
-    :param proto: protocol (tcp or udp)
-    """
-    return modify_access(src, dst=dst, port=port, proto=proto, action='delete')
-
-
-def service(name, action):
-    """
-    Open/close access to a service
-
-    :param name: could be a service name defined in `/etc/services` or a port
-                 number.
-    :param action: `open` or `close`
-    """
-    if action == 'open':
-        subprocess.check_output(['ufw', 'allow', str(name)],
-                                universal_newlines=True)
-    elif action == 'close':
-        subprocess.check_output(['ufw', 'delete', 'allow', str(name)],
-                                universal_newlines=True)
-    else:
-        raise UFWError(("'{}' not supported, use 'allow' "
-                        "or 'delete'").format(action))

=== removed directory 'hooks/charmhelpers/contrib/openstack'
=== removed file 'hooks/charmhelpers/contrib/openstack/__init__.py'
--- hooks/charmhelpers/contrib/openstack/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/openstack/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'hooks/charmhelpers/contrib/openstack/alternatives.py'
--- hooks/charmhelpers/contrib/openstack/alternatives.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/openstack/alternatives.py	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-''' Helper for managing alternatives for file conflict resolution '''
-
-import subprocess
-import shutil
-import os
-
-
-def install_alternative(name, target, source, priority=50):
-    ''' Install alternative configuration '''
-    if (os.path.exists(target) and not os.path.islink(target)):
-        # Move existing file/directory away before installing
-        shutil.move(target, '{}.bak'.format(target))
-    cmd = [
-        'update-alternatives', '--force', '--install',
-        target, name, source, str(priority)
-    ]
-    subprocess.check_call(cmd)

=== removed directory 'hooks/charmhelpers/contrib/openstack/amulet'
=== removed file 'hooks/charmhelpers/contrib/openstack/amulet/__init__.py'
--- hooks/charmhelpers/contrib/openstack/amulet/__init__.py	2015-01-23 11:08:26 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.

=== removed file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-23 14:54:24 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-import six
-from collections import OrderedDict
-from charmhelpers.contrib.amulet.deployment import (
-    AmuletDeployment
-)
-
-
-class OpenStackAmuletDeployment(AmuletDeployment):
-    """OpenStack amulet deployment.
-
-       This class inherits from AmuletDeployment and has additional support
-       that is specifically for use by OpenStack charms.
-       """
-
-    def __init__(self, series=None, openstack=None, source=None, stable=True):
-        """Initialize the deployment environment."""
-        super(OpenStackAmuletDeployment, self).__init__(series)
-        self.openstack = openstack
-        self.source = source
-        self.stable = stable
-        # Note(coreycb): this needs to be changed when new next branches come
-        # out.
-        self.current_next = "trusty"
-
-    def _determine_branch_locations(self, other_services):
-        """Determine the branch locations for the other services.
-
-           Determine if the local branch being tested is derived from its
-           stable or next (dev) branch, and based on this, use the corresonding
-           stable or next branches for the other_services."""
-        base_charms = ['mysql', 'mongodb']
-
-        if self.series in ['precise', 'trusty']:
-            base_series = self.series
-        else:
-            base_series = self.current_next
-
-        if self.stable:
-            for svc in other_services:
-                temp = 'lp:charms/{}/{}'
-                svc['location'] = temp.format(base_series,
-                                              svc['name'])
-        else:
-            for svc in other_services:
-                if svc['name'] in base_charms:
-                    temp = 'lp:charms/{}/{}'
-                    svc['location'] = temp.format(base_series,
-                                                  svc['name'])
-                else:
-                    temp = 'lp:~openstack-charmers/charms/{}/{}/next'
-                    svc['location'] = temp.format(self.current_next,
-                                                  svc['name'])
-        return other_services
-
-    def _add_services(self, this_service, other_services):
-        """Add services to the deployment and set openstack-origin/source."""
-        other_services = self._determine_branch_locations(other_services)
-
-        super(OpenStackAmuletDeployment, self)._add_services(this_service,
-                                                             other_services)
-
-        services = other_services
-        services.append(this_service)
-        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
-                      'ceph-osd', 'ceph-radosgw']
-        # Openstack subordinate charms do not expose an origin option as that
-        # is controlled by the principle
-        ignore = ['neutron-openvswitch']
-
-        if self.openstack:
-            for svc in services:
-                if svc['name'] not in use_source + ignore:
-                    config = {'openstack-origin': self.openstack}
-                    self.d.configure(svc['name'], config)
-
-        if self.source:
-            for svc in services:
-                if svc['name'] in use_source and svc['name'] not in ignore:
-                    config = {'source': self.source}
-                    self.d.configure(svc['name'], config)
-
-    def _configure_services(self, configs):
-        """Configure all of the services."""
-        for service, config in six.iteritems(configs):
-            self.d.configure(service, config)
-
-    def _get_openstack_release(self):
-        """Get openstack release.
-
-           Return an integer representing the enum value of the openstack
-           release.
-           """
-        # Must be ordered by OpenStack release (not by Ubuntu release):
-        (self.precise_essex, self.precise_folsom, self.precise_grizzly,
-         self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
-         self.trusty_kilo, self.vivid_kilo) = range(10)
-
-        releases = {
-            ('precise', None): self.precise_essex,
-            ('precise', 'cloud:precise-folsom'): self.precise_folsom,
-            ('precise', 'cloud:precise-grizzly'): self.precise_grizzly,
-            ('precise', 'cloud:precise-havana'): self.precise_havana,
-            ('precise', 'cloud:precise-icehouse'): self.precise_icehouse,
-            ('trusty', None): self.trusty_icehouse,
-            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
-            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
-            ('utopic', None): self.utopic_juno,
-            ('vivid', None): self.vivid_kilo}
-        return releases[(self.series, self.openstack)]
-
-    def _get_openstack_release_string(self):
-        """Get openstack release string.
-
-           Return a string representing the openstack release.
-           """
-        releases = OrderedDict([
-            ('precise', 'essex'),
-            ('quantal', 'folsom'),
-            ('raring', 'grizzly'),
-            ('saucy', 'havana'),
-            ('trusty', 'icehouse'),
-            ('utopic', 'juno'),
-            ('vivid', 'kilo'),
-        ])
-        if self.openstack:
-            os_origin = self.openstack.split(':')[1]
-            return os_origin.split('%s-' % self.series)[1].split('/')[0]
-        else:
-            return releases[self.series]

=== removed file 'hooks/charmhelpers/contrib/openstack/amulet/utils.py'
--- hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-03-31 15:13:53 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	1970-01-01 00:00:00 +0000
@@ -1,294 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-import os
-import time
-import urllib
-
-import glanceclient.v1.client as glance_client
-import keystoneclient.v2_0 as keystone_client
-import novaclient.v1_1.client as nova_client
-
-import six
-
-from charmhelpers.contrib.amulet.utils import (
-    AmuletUtils
-)
-
-DEBUG = logging.DEBUG
-ERROR = logging.ERROR
-
-
-class OpenStackAmuletUtils(AmuletUtils):
-    """OpenStack amulet utilities.
-
-       This class inherits from AmuletUtils and has additional support
-       that is specifically for use by OpenStack charms.
-       """
-
-    def __init__(self, log_level=ERROR):
-        """Initialize the deployment environment."""
-        super(OpenStackAmuletUtils, self).__init__(log_level)
-
-    def validate_endpoint_data(self, endpoints, admin_port, internal_port,
-                               public_port, expected):
-        """Validate endpoint data.
-
-           Validate actual endpoint data vs expected endpoint data. The ports
-           are used to find the matching endpoint.
-           """
-        found = False
-        for ep in endpoints:
-            self.log.debug('endpoint: {}'.format(repr(ep)))
-            if (admin_port in ep.adminurl and
-                    internal_port in ep.internalurl and
-                    public_port in ep.publicurl):
-                found = True
-                actual = {'id': ep.id,
-                          'region': ep.region,
-                          'adminurl': ep.adminurl,
-                          'internalurl': ep.internalurl,
-                          'publicurl': ep.publicurl,
-                          'service_id': ep.service_id}
-                ret = self._validate_dict_data(expected, actual)
-                if ret:
-                    return 'unexpected endpoint data - {}'.format(ret)
-
-        if not found:
-            return 'endpoint not found'
-
-    def validate_svc_catalog_endpoint_data(self, expected, actual):
-        """Validate service catalog endpoint data.
-
-           Validate a list of actual service catalog endpoints vs a list of
-           expected service catalog endpoints.
-           """
-        self.log.debug('actual: {}'.format(repr(actual)))
-        for k, v in six.iteritems(expected):
-            if k in actual:
-                ret = self._validate_dict_data(expected[k][0], actual[k][0])
-                if ret:
-                    return self.endpoint_error(k, ret)
-            else:
-                return "endpoint {} does not exist".format(k)
-        return ret
-
-    def validate_tenant_data(self, expected, actual):
-        """Validate tenant data.
-
-           Validate a list of actual tenant data vs list of expected tenant
-           data.
-           """
-        self.log.debug('actual: {}'.format(repr(actual)))
-        for e in expected:
-            found = False
-            for act in actual:
-                a = {'enabled': act.enabled, 'description': act.description,
-                     'name': act.name, 'id': act.id}
-                if e['name'] == a['name']:
-                    found = True
-                    ret = self._validate_dict_data(e, a)
-                    if ret:
-                        return "unexpected tenant data - {}".format(ret)
-            if not found:
-                return "tenant {} does not exist".format(e['name'])
-        return ret
-
-    def validate_role_data(self, expected, actual):
-        """Validate role data.
-
-           Validate a list of actual role data vs a list of expected role
-           data.
-           """
-        self.log.debug('actual: {}'.format(repr(actual)))
-        for e in expected:
-            found = False
-            for act in actual:
-                a = {'name': act.name, 'id': act.id}
-                if e['name'] == a['name']:
-                    found = True
-                    ret = self._validate_dict_data(e, a)
-                    if ret:
-                        return "unexpected role data - {}".format(ret)
-            if not found:
-                return "role {} does not exist".format(e['name'])
-        return ret
-
-    def validate_user_data(self, expected, actual):
-        """Validate user data.
-
-           Validate a list of actual user data vs a list of expected user
-           data.
-           """
-        self.log.debug('actual: {}'.format(repr(actual)))
-        for e in expected:
-            found = False
-            for act in actual:
-                a = {'enabled': act.enabled, 'name': act.name,
-                     'email': act.email, 'tenantId': act.tenantId,
-                     'id': act.id}
-                if e['name'] == a['name']:
-                    found = True
-                    ret = self._validate_dict_data(e, a)
-                    if ret:
-                        return "unexpected user data - {}".format(ret)
-            if not found:
-                return "user {} does not exist".format(e['name'])
-        return ret
-
-    def validate_flavor_data(self, expected, actual):
-        """Validate flavor data.
-
-           Validate a list of actual flavors vs a list of expected flavors.
-           """
-        self.log.debug('actual: {}'.format(repr(actual)))
-        act = [a.name for a in actual]
-        return self._validate_list_data(expected, act)
-
-    def tenant_exists(self, keystone, tenant):
-        """Return True if tenant exists."""
-        return tenant in [t.name for t in keystone.tenants.list()]
-
-    def authenticate_keystone_admin(self, keystone_sentry, user, password,
-                                    tenant):
-        """Authenticates admin user with the keystone admin endpoint."""
-        unit = keystone_sentry
-        service_ip = unit.relation('shared-db',
-                                   'mysql:shared-db')['private-address']
-        ep = "http://{}:35357/v2.0".format(service_ip.strip().decode('utf-8'))
-        return keystone_client.Client(username=user, password=password,
-                                      tenant_name=tenant, auth_url=ep)
-
-    def authenticate_keystone_user(self, keystone, user, password, tenant):
-        """Authenticates a regular user with the keystone public endpoint."""
-        ep = keystone.service_catalog.url_for(service_type='identity',
-                                              endpoint_type='publicURL')
-        return keystone_client.Client(username=user, password=password,
-                                      tenant_name=tenant, auth_url=ep)
-
-    def authenticate_glance_admin(self, keystone):
-        """Authenticates admin user with glance."""
-        ep = keystone.service_catalog.url_for(service_type='image',
-                                              endpoint_type='adminURL')
-        return glance_client.Client(ep, token=keystone.auth_token)
-
-    def authenticate_nova_user(self, keystone, user, password, tenant):
-        """Authenticates a regular user with nova-api."""
-        ep = keystone.service_catalog.url_for(service_type='identity',
-                                              endpoint_type='publicURL')
-        return nova_client.Client(username=user, api_key=password,
-                                  project_id=tenant, auth_url=ep)
-
-    def create_cirros_image(self, glance, image_name):
-        """Download the latest cirros image and upload it to glance."""
-        http_proxy = os.getenv('AMULET_HTTP_PROXY')
-        self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
-        if http_proxy:
-            proxies = {'http': http_proxy}
-            opener = urllib.FancyURLopener(proxies)
-        else:
-            opener = urllib.FancyURLopener()
-
-        f = opener.open("http://download.cirros-cloud.net/version/released")
-        version = f.read().strip()
-        cirros_img = "cirros-{}-x86_64-disk.img".format(version)
-        local_path = os.path.join('tests', cirros_img)
-
-        if not os.path.exists(local_path):
-            cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
-                                                  version, cirros_img)
-            opener.retrieve(cirros_url, local_path)
-        f.close()
-
-        with open(local_path) as f:
-            image = glance.images.create(name=image_name, is_public=True,
-                                         disk_format='qcow2',
-                                         container_format='bare', data=f)
-        count = 1
-        status = image.status
-        while status != 'active' and count < 10:
-            time.sleep(3)
-            image = glance.images.get(image.id)
-            status = image.status
-            self.log.debug('image status: {}'.format(status))
-            count += 1
-
-        if status != 'active':
-            self.log.error('image creation timed out')
-            return None
-
-        return image
-
-    def delete_image(self, glance, image):
-        """Delete the specified image."""
-        num_before = len(list(glance.images.list()))
-        glance.images.delete(image)
-
-        count = 1
-        num_after = len(list(glance.images.list()))
-        while num_after != (num_before - 1) and count < 10:
-            time.sleep(3)
-            num_after = len(list(glance.images.list()))
-            self.log.debug('number of images: {}'.format(num_after))
-            count += 1
-
-        if num_after != (num_before - 1):
-            self.log.error('image deletion timed out')
-            return False
-
-        return True
-
-    def create_instance(self, nova, image_name, instance_name, flavor):
-        """Create the specified instance."""
-        image = nova.images.find(name=image_name)
-        flavor = nova.flavors.find(name=flavor)
-        instance = nova.servers.create(name=instance_name, image=image,
-                                       flavor=flavor)
-
-        count = 1
-        status = instance.status
-        while status != 'ACTIVE' and count < 60:
-            time.sleep(3)
-            instance = nova.servers.get(instance.id)
-            status = instance.status
-            self.log.debug('instance status: {}'.format(status))
-            count += 1
-
-        if status != 'ACTIVE':
-            self.log.error('instance creation timed out')
-            return None
-
-        return instance
-
-    def delete_instance(self, nova, instance):
-        """Delete the specified instance."""
-        num_before = len(list(nova.servers.list()))
-        nova.servers.delete(instance)
-
-        count = 1
-        num_after = len(list(nova.servers.list()))
-        while num_after != (num_before - 1) and count < 10:
-            time.sleep(3)
-            num_after = len(list(nova.servers.list()))
-            self.log.debug('number of instances: {}'.format(num_after))
-            count += 1
-
-        if num_after != (num_before - 1):
-            self.log.error('instance deletion timed out')
-            return False
-
-        return True

=== removed file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-04-16 21:35:13 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	1970-01-01 00:00:00 +0000
@@ -1,1328 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-import os
-import re
-import time
-from base64 import b64decode
-from subprocess import check_call
-
-import six
-import yaml
-
-from charmhelpers.fetch import (
-    apt_install,
-    filter_installed_packages,
-)
-from charmhelpers.core.hookenv import (
-    config,
-    is_relation_made,
-    local_unit,
-    log,
-    relation_get,
-    relation_ids,
-    related_units,
-    relation_set,
-    unit_get,
-    unit_private_ip,
-    charm_name,
-    DEBUG,
-    INFO,
-    WARNING,
-    ERROR,
-)
-
-from charmhelpers.core.sysctl import create as sysctl_create
-from charmhelpers.core.strutils import bool_from_string
-
-from charmhelpers.core.host import (
-    list_nics,
-    get_nic_hwaddr,
-    mkdir,
-    write_file,
-)
-from charmhelpers.contrib.hahelpers.cluster import (
-    determine_apache_port,
-    determine_api_port,
-    https,
-    is_clustered,
-)
-from charmhelpers.contrib.hahelpers.apache import (
-    get_cert,
-    get_ca_cert,
-    install_ca_cert,
-)
-from charmhelpers.contrib.openstack.neutron import (
-    neutron_plugin_attribute,
-    parse_data_port_mappings,
-)
-from charmhelpers.contrib.openstack.ip import (
-    resolve_address,
-    INTERNAL,
-)
-from charmhelpers.contrib.network.ip import (
-    get_address_in_network,
-    get_ipv4_addr,
-    get_ipv6_addr,
-    get_netmask_for_address,
-    format_ipv6_addr,
-    is_address_in_network,
-    is_bridge_member,
-)
-from charmhelpers.contrib.openstack.utils import get_host_ip
-CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
-ADDRESS_TYPES = ['admin', 'internal', 'public']
-
-
-class OSContextError(Exception):
-    pass
-
-
-def ensure_packages(packages):
-    """Install but do not upgrade required plugin packages."""
-    required = filter_installed_packages(packages)
-    if required:
-        apt_install(required, fatal=True)
-
-
-def context_complete(ctxt):
-    _missing = []
-    for k, v in six.iteritems(ctxt):
-        if v is None or v == '':
-            _missing.append(k)
-
-    if _missing:
-        log('Missing required data: %s' % ' '.join(_missing), level=INFO)
-        return False
-
-    return True
-
-
-def config_flags_parser(config_flags):
-    """Parses config flags string into dict.
-
-    This parsing method supports a few different formats for the config
-    flag values to be parsed:
-
-      1. A string in the simple format of key=value pairs, with the possibility
-         of specifying multiple key value pairs within the same string. For
-         example, a string in the format of 'key1=value1, key2=value2' will
-         return a dict of:
-         {'key1': 'value1',
-          'key2': 'value2'}.
-
-      2. A string in the above format, but supporting a comma-delimited list
-         of values for the same key. For example, a string in the format of
-         'key1=value1, key2=value3,value4,value5' will return a dict of:
-         {'key1', 'value1',
-          'key2', 'value2,value3,value4'}
-
-      3. A string containing a colon character (:) prior to an equal
-         character (=) will be treated as yaml and parsed as such. This can be
-         used to specify more complex key value pairs. For example,
-         a string in the format of 'key1: subkey1=value1, subkey2=value2' will
-         return a dict of:
-         {'key1', 'subkey1=value1, subkey2=value2'}
-
-    The provided config_flags string may be a list of comma-separated values
-    which themselves may be comma-separated list of values.
-    """
-    # If we find a colon before an equals sign then treat it as yaml.
-    # Note: limit it to finding the colon first since this indicates assignment
-    # for inline yaml.
-    colon = config_flags.find(':')
-    equals = config_flags.find('=')
-    if colon > 0:
-        if colon < equals or equals < 0:
-            return yaml.safe_load(config_flags)
-
-    if config_flags.find('==') >= 0:
-        log("config_flags is not in expected format (key=value)", level=ERROR)
-        raise OSContextError
-
-    # strip the following from each value.
-    post_strippers = ' ,'
-    # we strip any leading/trailing '=' or ' ' from the string then
-    # split on '='.
-    split = config_flags.strip(' =').split('=')
-    limit = len(split)
-    flags = {}
-    for i in range(0, limit - 1):
-        current = split[i]
-        next = split[i + 1]
-        vindex = next.rfind(',')
-        if (i == limit - 2) or (vindex < 0):
-            value = next
-        else:
-            value = next[:vindex]
-
-        if i == 0:
-            key = current
-        else:
-            # if this not the first entry, expect an embedded key.
-            index = current.rfind(',')
-            if index < 0:
-                log("Invalid config value(s) at index %s" % (i), level=ERROR)
-                raise OSContextError
-            key = current[index + 1:]
-
-        # Add to collection.
-        flags[key.strip(post_strippers)] = value.rstrip(post_strippers)
-
-    return flags
-
-
-class OSContextGenerator(object):
-    """Base class for all context generators."""
-    interfaces = []
-
-    def __call__(self):
-        raise NotImplementedError
-
-
-class SharedDBContext(OSContextGenerator):
-    interfaces = ['shared-db']
-
-    def __init__(self,
-                 database=None, user=None, relation_prefix=None, ssl_dir=None):
-        """Allows inspecting relation for settings prefixed with
-        relation_prefix. This is useful for parsing access for multiple
-        databases returned via the shared-db interface (eg, nova_password,
-        quantum_password)
-        """
-        self.relation_prefix = relation_prefix
-        self.database = database
-        self.user = user
-        self.ssl_dir = ssl_dir
-
-    def __call__(self):
-        self.database = self.database or config('database')
-        self.user = self.user or config('database-user')
-        if None in [self.database, self.user]:
-            log("Could not generate shared_db context. Missing required charm "
-                "config options. (database name and user)", level=ERROR)
-            raise OSContextError
-
-        ctxt = {}
-
-        # NOTE(jamespage) if mysql charm provides a network upon which
-        # access to the database should be made, reconfigure relation
-        # with the service units local address and defer execution
-        access_network = relation_get('access-network')
-        if access_network is not None:
-            if self.relation_prefix is not None:
-                hostname_key = "{}_hostname".format(self.relation_prefix)
-            else:
-                hostname_key = "hostname"
-            access_hostname = get_address_in_network(access_network,
-                                                     unit_get('private-address'))
-            set_hostname = relation_get(attribute=hostname_key,
-                                        unit=local_unit())
-            if set_hostname != access_hostname:
-                relation_set(relation_settings={hostname_key: access_hostname})
-                return None  # Defer any further hook execution for now....
-
-        password_setting = 'password'
-        if self.relation_prefix:
-            password_setting = self.relation_prefix + '_password'
-
-        for rid in relation_ids('shared-db'):
-            for unit in related_units(rid):
-                rdata = relation_get(rid=rid, unit=unit)
-                host = rdata.get('db_host')
-                host = format_ipv6_addr(host) or host
-                ctxt = {
-                    'database_host': host,
-                    'database': self.database,
-                    'database_user': self.user,
-                    'database_password': rdata.get(password_setting),
-                    'database_type': 'mysql'
-                }
-                if context_complete(ctxt):
-                    db_ssl(rdata, ctxt, self.ssl_dir)
-                    return ctxt
-        return {}
-
-
-class PostgresqlDBContext(OSContextGenerator):
-    interfaces = ['pgsql-db']
-
-    def __init__(self, database=None):
-        self.database = database
-
-    def __call__(self):
-        self.database = self.database or config('database')
-        if self.database is None:
-            log('Could not generate postgresql_db context. Missing required '
-                'charm config options. (database name)', level=ERROR)
-            raise OSContextError
-
-        ctxt = {}
-        for rid in relation_ids(self.interfaces[0]):
-            for unit in related_units(rid):
-                rel_host = relation_get('host', rid=rid, unit=unit)
-                rel_user = relation_get('user', rid=rid, unit=unit)
-                rel_passwd = relation_get('password', rid=rid, unit=unit)
-                ctxt = {'database_host': rel_host,
-                        'database': self.database,
-                        'database_user': rel_user,
-                        'database_password': rel_passwd,
-                        'database_type': 'postgresql'}
-                if context_complete(ctxt):
-                    return ctxt
-
-        return {}
-
-
-def db_ssl(rdata, ctxt, ssl_dir):
-    if 'ssl_ca' in rdata and ssl_dir:
-        ca_path = os.path.join(ssl_dir, 'db-client.ca')
-        with open(ca_path, 'w') as fh:
-            fh.write(b64decode(rdata['ssl_ca']))
-
-        ctxt['database_ssl_ca'] = ca_path
-    elif 'ssl_ca' in rdata:
-        log("Charm not setup for ssl support but ssl ca found", level=INFO)
-        return ctxt
-
-    if 'ssl_cert' in rdata:
-        cert_path = os.path.join(
-            ssl_dir, 'db-client.cert')
-        if not os.path.exists(cert_path):
-            log("Waiting 1m for ssl client cert validity", level=INFO)
-            time.sleep(60)
-
-        with open(cert_path, 'w') as fh:
-            fh.write(b64decode(rdata['ssl_cert']))
-
-        ctxt['database_ssl_cert'] = cert_path
-        key_path = os.path.join(ssl_dir, 'db-client.key')
-        with open(key_path, 'w') as fh:
-            fh.write(b64decode(rdata['ssl_key']))
-
-        ctxt['database_ssl_key'] = key_path
-
-    return ctxt
-
-
-class IdentityServiceContext(OSContextGenerator):
-
-    def __init__(self, service=None, service_user=None, rel_name='identity-service'):
-        self.service = service
-        self.service_user = service_user
-        self.rel_name = rel_name
-        self.interfaces = [self.rel_name]
-
-    def __call__(self):
-        log('Generating template context for ' + self.rel_name, level=DEBUG)
-        ctxt = {}
-
-        if self.service and self.service_user:
-            # This is required for pki token signing if we don't want /tmp to
-            # be used.
-            cachedir = '/var/cache/%s' % (self.service)
-            if not os.path.isdir(cachedir):
-                log("Creating service cache dir %s" % (cachedir), level=DEBUG)
-                mkdir(path=cachedir, owner=self.service_user,
-                      group=self.service_user, perms=0o700)
-
-            ctxt['signing_dir'] = cachedir
-
-        for rid in relation_ids(self.rel_name):
-            for unit in related_units(rid):
-                rdata = relation_get(rid=rid, unit=unit)
-                serv_host = rdata.get('service_host')
-                serv_host = format_ipv6_addr(serv_host) or serv_host
-                auth_host = rdata.get('auth_host')
-                auth_host = format_ipv6_addr(auth_host) or auth_host
-                svc_protocol = rdata.get('service_protocol') or 'http'
-                auth_protocol = rdata.get('auth_protocol') or 'http'
-                ctxt.update({'service_port': rdata.get('service_port'),
-                             'service_host': serv_host,
-                             'auth_host': auth_host,
-                             'auth_port': rdata.get('auth_port'),
-                             'admin_tenant_name': rdata.get('service_tenant'),
-                             'admin_user': rdata.get('service_username'),
-                             'admin_password': rdata.get('service_password'),
-                             'service_protocol': svc_protocol,
-                             'auth_protocol': auth_protocol})
-
-                if context_complete(ctxt):
-                    # NOTE(jamespage) this is required for >= icehouse
-                    # so a missing value just indicates keystone needs
-                    # upgrading
-                    ctxt['admin_tenant_id'] = rdata.get('service_tenant_id')
-                    return ctxt
-
-        return {}
-
-
-class AMQPContext(OSContextGenerator):
-
-    def __init__(self, ssl_dir=None, rel_name='amqp', relation_prefix=None):
-        self.ssl_dir = ssl_dir
-        self.rel_name = rel_name
-        self.relation_prefix = relation_prefix
-        self.interfaces = [rel_name]
-
-    def __call__(self):
-        log('Generating template context for amqp', level=DEBUG)
-        conf = config()
-        if self.relation_prefix:
-            user_setting = '%s-rabbit-user' % (self.relation_prefix)
-            vhost_setting = '%s-rabbit-vhost' % (self.relation_prefix)
-        else:
-            user_setting = 'rabbit-user'
-            vhost_setting = 'rabbit-vhost'
-
-        try:
-            username = conf[user_setting]
-            vhost = conf[vhost_setting]
-        except KeyError as e:
-            log('Could not generate shared_db context. Missing required charm '
-                'config options: %s.' % e, level=ERROR)
-            raise OSContextError
-
-        ctxt = {}
-        for rid in relation_ids(self.rel_name):
-            ha_vip_only = False
-            for unit in related_units(rid):
-                if relation_get('clustered', rid=rid, unit=unit):
-                    ctxt['clustered'] = True
-                    vip = relation_get('vip', rid=rid, unit=unit)
-                    vip = format_ipv6_addr(vip) or vip
-                    ctxt['rabbitmq_host'] = vip
-                else:
-                    host = relation_get('private-address', rid=rid, unit=unit)
-                    host = format_ipv6_addr(host) or host
-                    ctxt['rabbitmq_host'] = host
-
-                ctxt.update({
-                    'rabbitmq_user': username,
-                    'rabbitmq_password': relation_get('password', rid=rid,
-                                                      unit=unit),
-                    'rabbitmq_virtual_host': vhost,
-                })
-
-                ssl_port = relation_get('ssl_port', rid=rid, unit=unit)
-                if ssl_port:
-                    ctxt['rabbit_ssl_port'] = ssl_port
-
-                ssl_ca = relation_get('ssl_ca', rid=rid, unit=unit)
-                if ssl_ca:
-                    ctxt['rabbit_ssl_ca'] = ssl_ca
-
-                if relation_get('ha_queues', rid=rid, unit=unit) is not None:
-                    ctxt['rabbitmq_ha_queues'] = True
-
-                ha_vip_only = relation_get('ha-vip-only',
-                                           rid=rid, unit=unit) is not None
-
-                if context_complete(ctxt):
-                    if 'rabbit_ssl_ca' in ctxt:
-                        if not self.ssl_dir:
-                            log("Charm not setup for ssl support but ssl ca "
-                                "found", level=INFO)
-                            break
-
-                        ca_path = os.path.join(
-                            self.ssl_dir, 'rabbit-client-ca.pem')
-                        with open(ca_path, 'w') as fh:
-                            fh.write(b64decode(ctxt['rabbit_ssl_ca']))
-                            ctxt['rabbit_ssl_ca'] = ca_path
-
-                    # Sufficient information found = break out!
-                    break
-
-            # Used for active/active rabbitmq >= grizzly
-            if (('clustered' not in ctxt or ha_vip_only) and
-                    len(related_units(rid)) > 1):
-                rabbitmq_hosts = []
-                for unit in related_units(rid):
-                    host = relation_get('private-address', rid=rid, unit=unit)
-                    host = format_ipv6_addr(host) or host
-                    rabbitmq_hosts.append(host)
-
-                ctxt['rabbitmq_hosts'] = ','.join(sorted(rabbitmq_hosts))
-
-        oslo_messaging_flags = conf.get('oslo-messaging-flags', None)
-        if oslo_messaging_flags:
-            ctxt['oslo_messaging_flags'] = config_flags_parser(
-                oslo_messaging_flags)
-
-        if not context_complete(ctxt):
-            return {}
-
-        return ctxt
-
-
-class CephContext(OSContextGenerator):
-    """Generates context for /etc/ceph/ceph.conf templates."""
-    interfaces = ['ceph']
-
-    def __call__(self):
-        if not relation_ids('ceph'):
-            return {}
-
-        log('Generating template context for ceph', level=DEBUG)
-        mon_hosts = []
-        auth = None
-        key = None
-        use_syslog = str(config('use-syslog')).lower()
-        for rid in relation_ids('ceph'):
-            for unit in related_units(rid):
-                auth = relation_get('auth', rid=rid, unit=unit)
-                key = relation_get('key', rid=rid, unit=unit)
-                ceph_pub_addr = relation_get('ceph-public-address', rid=rid,
-                                             unit=unit)
-                unit_priv_addr = relation_get('private-address', rid=rid,
-                                              unit=unit)
-                ceph_addr = ceph_pub_addr or unit_priv_addr
-                ceph_addr = format_ipv6_addr(ceph_addr) or ceph_addr
-                mon_hosts.append(ceph_addr)
-
-        ctxt = {'mon_hosts': ' '.join(sorted(mon_hosts)),
-                'auth': auth,
-                'key': key,
-                'use_syslog': use_syslog}
-
-        if not os.path.isdir('/etc/ceph'):
-            os.mkdir('/etc/ceph')
-
-        if not context_complete(ctxt):
-            return {}
-
-        ensure_packages(['ceph-common'])
-        return ctxt
-
-
-class HAProxyContext(OSContextGenerator):
-    """Provides half a context for the haproxy template, which describes
-    all peers to be included in the cluster.  Each charm needs to include
-    its own context generator that describes the port mapping.
-    """
-    interfaces = ['cluster']
-
-    def __init__(self, singlenode_mode=False):
-        self.singlenode_mode = singlenode_mode
-
-    def __call__(self):
-        if not relation_ids('cluster') and not self.singlenode_mode:
-            return {}
-
-        if config('prefer-ipv6'):
-            addr = get_ipv6_addr(exc_list=[config('vip')])[0]
-        else:
-            addr = get_host_ip(unit_get('private-address'))
-
-        l_unit = local_unit().replace('/', '-')
-        cluster_hosts = {}
-
-        # NOTE(jamespage): build out map of configured network endpoints
-        # and associated backends
-        for addr_type in ADDRESS_TYPES:
-            cfg_opt = 'os-{}-network'.format(addr_type)
-            laddr = get_address_in_network(config(cfg_opt))
-            if laddr:
-                netmask = get_netmask_for_address(laddr)
-                cluster_hosts[laddr] = {'network': "{}/{}".format(laddr,
-                                                                  netmask),
-                                        'backends': {l_unit: laddr}}
-                for rid in relation_ids('cluster'):
-                    for unit in related_units(rid):
-                        _laddr = relation_get('{}-address'.format(addr_type),
-                                              rid=rid, unit=unit)
-                        if _laddr:
-                            _unit = unit.replace('/', '-')
-                            cluster_hosts[laddr]['backends'][_unit] = _laddr
-
-        # NOTE(jamespage) add backend based on private address - this
-        # with either be the only backend or the fallback if no acls
-        # match in the frontend
-        cluster_hosts[addr] = {}
-        netmask = get_netmask_for_address(addr)
-        cluster_hosts[addr] = {'network': "{}/{}".format(addr, netmask),
-                               'backends': {l_unit: addr}}
-        for rid in relation_ids('cluster'):
-            for unit in related_units(rid):
-                _laddr = relation_get('private-address',
-                                      rid=rid, unit=unit)
-                if _laddr:
-                    _unit = unit.replace('/', '-')
-                    cluster_hosts[addr]['backends'][_unit] = _laddr
-
-        ctxt = {
-            'frontends': cluster_hosts,
-            'default_backend': addr
-        }
-
-        if config('haproxy-server-timeout'):
-            ctxt['haproxy_server_timeout'] = config('haproxy-server-timeout')
-
-        if config('haproxy-client-timeout'):
-            ctxt['haproxy_client_timeout'] = config('haproxy-client-timeout')
-
-        if config('prefer-ipv6'):
-            ctxt['ipv6'] = True
-            ctxt['local_host'] = 'ip6-localhost'
-            ctxt['haproxy_host'] = '::'
-            ctxt['stat_port'] = ':::8888'
-        else:
-            ctxt['local_host'] = '127.0.0.1'
-            ctxt['haproxy_host'] = '0.0.0.0'
-            ctxt['stat_port'] = ':8888'
-
-        for frontend in cluster_hosts:
-            if (len(cluster_hosts[frontend]['backends']) > 1 or
-                    self.singlenode_mode):
-                # Enable haproxy when we have enough peers.
-                log('Ensuring haproxy enabled in /etc/default/haproxy.',
-                    level=DEBUG)
-                with open('/etc/default/haproxy', 'w') as out:
-                    out.write('ENABLED=1\n')
-
-                return ctxt
-
-        log('HAProxy context is incomplete, this unit has no peers.',
-            level=INFO)
-        return {}
-
-
-class ImageServiceContext(OSContextGenerator):
-    interfaces = ['image-service']
-
-    def __call__(self):
-        """Obtains the glance API server from the image-service relation.
-        Useful in nova and cinder (currently).
-        """
-        log('Generating template context for image-service.', level=DEBUG)
-        rids = relation_ids('image-service')
-        if not rids:
-            return {}
-
-        for rid in rids:
-            for unit in related_units(rid):
-                api_server = relation_get('glance-api-server',
-                                          rid=rid, unit=unit)
-                if api_server:
-                    return {'glance_api_servers': api_server}
-
-        log("ImageService context is incomplete. Missing required relation "
-            "data.", level=INFO)
-        return {}
-
-
-class ApacheSSLContext(OSContextGenerator):
-    """Generates a context for an apache vhost configuration that configures
-    HTTPS reverse proxying for one or many endpoints.  Generated context
-    looks something like::
-
-        {
-            'namespace': 'cinder',
-            'private_address': 'iscsi.mycinderhost.com',
-            'endpoints': [(8776, 8766), (8777, 8767)]
-        }
-
-    The endpoints list consists of a tuples mapping external ports
-    to internal ports.
-    """
-    interfaces = ['https']
-
-    # charms should inherit this context and set external ports
-    # and service namespace accordingly.
-    external_ports = []
-    service_namespace = None
-
-    def enable_modules(self):
-        cmd = ['a2enmod', 'ssl', 'proxy', 'proxy_http']
-        check_call(cmd)
-
-    def configure_cert(self, cn=None):
-        ssl_dir = os.path.join('/etc/apache2/ssl/', self.service_namespace)
-        mkdir(path=ssl_dir)
-        cert, key = get_cert(cn)
-        if cn:
-            cert_filename = 'cert_{}'.format(cn)
-            key_filename = 'key_{}'.format(cn)
-        else:
-            cert_filename = 'cert'
-            key_filename = 'key'
-
-        write_file(path=os.path.join(ssl_dir, cert_filename),
-                   content=b64decode(cert))
-        write_file(path=os.path.join(ssl_dir, key_filename),
-                   content=b64decode(key))
-
-    def configure_ca(self):
-        ca_cert = get_ca_cert()
-        if ca_cert:
-            install_ca_cert(b64decode(ca_cert))
-
-    def canonical_names(self):
-        """Figure out which canonical names clients will access this service.
-        """
-        cns = []
-        for r_id in relation_ids('identity-service'):
-            for unit in related_units(r_id):
-                rdata = relation_get(rid=r_id, unit=unit)
-                for k in rdata:
-                    if k.startswith('ssl_key_'):
-                        cns.append(k.lstrip('ssl_key_'))
-
-        return sorted(list(set(cns)))
-
-    def get_network_addresses(self):
-        """For each network configured, return corresponding address and vip
-           (if available).
-
-        Returns a list of tuples of the form:
-
-            [(address_in_net_a, vip_in_net_a),
-             (address_in_net_b, vip_in_net_b),
-             ...]
-
-            or, if no vip(s) available:
-
-            [(address_in_net_a, address_in_net_a),
-             (address_in_net_b, address_in_net_b),
-             ...]
-        """
-        addresses = []
-        if config('vip'):
-            vips = config('vip').split()
-        else:
-            vips = []
-
-        for net_type in ['os-internal-network', 'os-admin-network',
-                         'os-public-network']:
-            addr = get_address_in_network(config(net_type),
-                                          unit_get('private-address'))
-            if len(vips) > 1 and is_clustered():
-                if not config(net_type):
-                    log("Multiple networks configured but net_type "
-                        "is None (%s)." % net_type, level=WARNING)
-                    continue
-
-                for vip in vips:
-                    if is_address_in_network(config(net_type), vip):
-                        addresses.append((addr, vip))
-                        break
-
-            elif is_clustered() and config('vip'):
-                addresses.append((addr, config('vip')))
-            else:
-                addresses.append((addr, addr))
-
-        return sorted(addresses)
-
-    def __call__(self):
-        if isinstance(self.external_ports, six.string_types):
-            self.external_ports = [self.external_ports]
-
-        if not self.external_ports or not https():
-            return {}
-
-        self.configure_ca()
-        self.enable_modules()
-
-        ctxt = {'namespace': self.service_namespace,
-                'endpoints': [],
-                'ext_ports': []}
-
-        cns = self.canonical_names()
-        if cns:
-            for cn in cns:
-                self.configure_cert(cn)
-        else:
-            # Expect cert/key provided in config (currently assumed that ca
-            # uses ip for cn)
-            cn = resolve_address(endpoint_type=INTERNAL)
-            self.configure_cert(cn)
-
-        addresses = self.get_network_addresses()
-        for address, endpoint in sorted(set(addresses)):
-            for api_port in self.external_ports:
-                ext_port = determine_apache_port(api_port,
-                                                 singlenode_mode=True)
-                int_port = determine_api_port(api_port, singlenode_mode=True)
-                portmap = (address, endpoint, int(ext_port), int(int_port))
-                ctxt['endpoints'].append(portmap)
-                ctxt['ext_ports'].append(int(ext_port))
-
-        ctxt['ext_ports'] = sorted(list(set(ctxt['ext_ports'])))
-        return ctxt
-
-
-class NeutronContext(OSContextGenerator):
-    interfaces = []
-
-    @property
-    def plugin(self):
-        return None
-
-    @property
-    def network_manager(self):
-        return None
-
-    @property
-    def packages(self):
-        return neutron_plugin_attribute(self.plugin, 'packages',
-                                        self.network_manager)
-
-    @property
-    def neutron_security_groups(self):
-        return None
-
-    def _ensure_packages(self):
-        for pkgs in self.packages:
-            ensure_packages(pkgs)
-
-    def _save_flag_file(self):
-        if self.network_manager == 'quantum':
-            _file = '/etc/nova/quantum_plugin.conf'
-        else:
-            _file = '/etc/nova/neutron_plugin.conf'
-
-        with open(_file, 'wb') as out:
-            out.write(self.plugin + '\n')
-
-    def ovs_ctxt(self):
-        driver = neutron_plugin_attribute(self.plugin, 'driver',
-                                          self.network_manager)
-        config = neutron_plugin_attribute(self.plugin, 'config',
-                                          self.network_manager)
-        ovs_ctxt = {'core_plugin': driver,
-                    'neutron_plugin': 'ovs',
-                    'neutron_security_groups': self.neutron_security_groups,
-                    'local_ip': unit_private_ip(),
-                    'config': config}
-
-        return ovs_ctxt
-
-    def nuage_ctxt(self):
-        driver = neutron_plugin_attribute(self.plugin, 'driver',
-                                          self.network_manager)
-        config = neutron_plugin_attribute(self.plugin, 'config',
-                                          self.network_manager)
-        nuage_ctxt = {'core_plugin': driver,
-                      'neutron_plugin': 'vsp',
-                      'neutron_security_groups': self.neutron_security_groups,
-                      'local_ip': unit_private_ip(),
-                      'config': config}
-
-        return nuage_ctxt
-
-    def nvp_ctxt(self):
-        driver = neutron_plugin_attribute(self.plugin, 'driver',
-                                          self.network_manager)
-        config = neutron_plugin_attribute(self.plugin, 'config',
-                                          self.network_manager)
-        nvp_ctxt = {'core_plugin': driver,
-                    'neutron_plugin': 'nvp',
-                    'neutron_security_groups': self.neutron_security_groups,
-                    'local_ip': unit_private_ip(),
-                    'config': config}
-
-        return nvp_ctxt
-
-    def n1kv_ctxt(self):
-        driver = neutron_plugin_attribute(self.plugin, 'driver',
-                                          self.network_manager)
-        n1kv_config = neutron_plugin_attribute(self.plugin, 'config',
-                                               self.network_manager)
-        n1kv_user_config_flags = config('n1kv-config-flags')
-        restrict_policy_profiles = config('n1kv-restrict-policy-profiles')
-        n1kv_ctxt = {'core_plugin': driver,
-                     'neutron_plugin': 'n1kv',
-                     'neutron_security_groups': self.neutron_security_groups,
-                     'local_ip': unit_private_ip(),
-                     'config': n1kv_config,
-                     'vsm_ip': config('n1kv-vsm-ip'),
-                     'vsm_username': config('n1kv-vsm-username'),
-                     'vsm_password': config('n1kv-vsm-password'),
-                     'restrict_policy_profiles': restrict_policy_profiles}
-
-        if n1kv_user_config_flags:
-            flags = config_flags_parser(n1kv_user_config_flags)
-            n1kv_ctxt['user_config_flags'] = flags
-
-        return n1kv_ctxt
-
-    def calico_ctxt(self):
-        driver = neutron_plugin_attribute(self.plugin, 'driver',
-                                          self.network_manager)
-        config = neutron_plugin_attribute(self.plugin, 'config',
-                                          self.network_manager)
-        calico_ctxt = {'core_plugin': driver,
-                       'neutron_plugin': 'Calico',
-                       'neutron_security_groups': self.neutron_security_groups,
-                       'local_ip': unit_private_ip(),
-                       'config': config}
-
-        return calico_ctxt
-
-    def neutron_ctxt(self):
-        if https():
-            proto = 'https'
-        else:
-            proto = 'http'
-
-        if is_clustered():
-            host = config('vip')
-        else:
-            host = unit_get('private-address')
-
-        ctxt = {'network_manager': self.network_manager,
-                'neutron_url': '%s://%s:%s' % (proto, host, '9696')}
-        return ctxt
-
-    def __call__(self):
-        self._ensure_packages()
-
-        if self.network_manager not in ['quantum', 'neutron']:
-            return {}
-
-        if not self.plugin:
-            return {}
-
-        ctxt = self.neutron_ctxt()
-
-        if self.plugin == 'ovs':
-            ctxt.update(self.ovs_ctxt())
-        elif self.plugin in ['nvp', 'nsx']:
-            ctxt.update(self.nvp_ctxt())
-        elif self.plugin == 'n1kv':
-            ctxt.update(self.n1kv_ctxt())
-        elif self.plugin == 'Calico':
-            ctxt.update(self.calico_ctxt())
-        elif self.plugin == 'vsp':
-            ctxt.update(self.nuage_ctxt())
-
-        alchemy_flags = config('neutron-alchemy-flags')
-        if alchemy_flags:
-            flags = config_flags_parser(alchemy_flags)
-            ctxt['neutron_alchemy_flags'] = flags
-
-        self._save_flag_file()
-        return ctxt
-
-
-class NeutronPortContext(OSContextGenerator):
-    NIC_PREFIXES = ['eth', 'bond']
-
-    def resolve_ports(self, ports):
-        """Resolve NICs not yet bound to bridge(s)
-
-        If hwaddress provided then returns resolved hwaddress otherwise NIC.
-        """
-        if not ports:
-            return None
-
-        hwaddr_to_nic = {}
-        hwaddr_to_ip = {}
-        for nic in list_nics(self.NIC_PREFIXES):
-            hwaddr = get_nic_hwaddr(nic)
-            hwaddr_to_nic[hwaddr] = nic
-            addresses = get_ipv4_addr(nic, fatal=False)
-            addresses += get_ipv6_addr(iface=nic, fatal=False)
-            hwaddr_to_ip[hwaddr] = addresses
-
-        resolved = []
-        mac_regex = re.compile(r'([0-9A-F]{2}[:-]){5}([0-9A-F]{2})', re.I)
-        for entry in ports:
-            if re.match(mac_regex, entry):
-                # NIC is in known NICs and does NOT hace an IP address
-                if entry in hwaddr_to_nic and not hwaddr_to_ip[entry]:
-                    # If the nic is part of a bridge then don't use it
-                    if is_bridge_member(hwaddr_to_nic[entry]):
-                        continue
-
-                    # Entry is a MAC address for a valid interface that doesn't
-                    # have an IP address assigned yet.
-                    resolved.append(hwaddr_to_nic[entry])
-            else:
-                # If the passed entry is not a MAC address, assume it's a valid
-                # interface, and that the user put it there on purpose (we can
-                # trust it to be the real external network).
-                resolved.append(entry)
-
-        return resolved
-
-
-class OSConfigFlagContext(OSContextGenerator):
-    """Provides support for user-defined config flags.
-
-    Users can define a comma-seperated list of key=value pairs
-    in the charm configuration and apply them at any point in
-    any file by using a template flag.
-
-    Sometimes users might want config flags inserted within a
-    specific section so this class allows users to specify the
-    template flag name, allowing for multiple template flags
-    (sections) within the same context.
-
-    NOTE: the value of config-flags may be a comma-separated list of
-          key=value pairs and some Openstack config files support
-          comma-separated lists as values.
-    """
-
-    def __init__(self, charm_flag='config-flags',
-                 template_flag='user_config_flags'):
-        """
-        :param charm_flag: config flags in charm configuration.
-        :param template_flag: insert point for user-defined flags in template
-                              file.
-        """
-        super(OSConfigFlagContext, self).__init__()
-        self._charm_flag = charm_flag
-        self._template_flag = template_flag
-
-    def __call__(self):
-        config_flags = config(self._charm_flag)
-        if not config_flags:
-            return {}
-
-        return {self._template_flag:
-                config_flags_parser(config_flags)}
-
-
-class SubordinateConfigContext(OSContextGenerator):
-
-    """
-    Responsible for inspecting relations to subordinates that
-    may be exporting required config via a json blob.
-
-    The subordinate interface allows subordinates to export their
-    configuration requirements to the principle for multiple config
-    files and multiple serivces.  Ie, a subordinate that has interfaces
-    to both glance and nova may export to following yaml blob as json::
-
-        glance:
-            /etc/glance/glance-api.conf:
-                sections:
-                    DEFAULT:
-                        - [key1, value1]
-            /etc/glance/glance-registry.conf:
-                    MYSECTION:
-                        - [key2, value2]
-        nova:
-            /etc/nova/nova.conf:
-                sections:
-                    DEFAULT:
-                        - [key3, value3]
-
-
-    It is then up to the principle charms to subscribe this context to
-    the service+config file it is interestd in.  Configuration data will
-    be available in the template context, in glance's case, as::
-
-        ctxt = {
-            ... other context ...
-            'subordinate_config': {
-                'DEFAULT': {
-                    'key1': 'value1',
-                },
-                'MYSECTION': {
-                    'key2': 'value2',
-                },
-            }
-        }
-    """
-
-    def __init__(self, service, config_file, interface):
-        """
-        :param service     : Service name key to query in any subordinate
-                             data found
-        :param config_file : Service's config file to query sections
-        :param interface   : Subordinate interface to inspect
-        """
-        self.service = service
-        self.config_file = config_file
-        self.interface = interface
-
-    def __call__(self):
-        ctxt = {'sections': {}}
-        for rid in relation_ids(self.interface):
-            for unit in related_units(rid):
-                sub_config = relation_get('subordinate_configuration',
-                                          rid=rid, unit=unit)
-                if sub_config and sub_config != '':
-                    try:
-                        sub_config = json.loads(sub_config)
-                    except:
-                        log('Could not parse JSON from subordinate_config '
-                            'setting from %s' % rid, level=ERROR)
-                        continue
-
-                    if self.service not in sub_config:
-                        log('Found subordinate_config on %s but it contained'
-                            'nothing for %s service' % (rid, self.service),
-                            level=INFO)
-                        continue
-
-                    sub_config = sub_config[self.service]
-                    if self.config_file not in sub_config:
-                        log('Found subordinate_config on %s but it contained'
-                            'nothing for %s' % (rid, self.config_file),
-                            level=INFO)
-                        continue
-
-                    sub_config = sub_config[self.config_file]
-                    for k, v in six.iteritems(sub_config):
-                        if k == 'sections':
-                            for section, config_dict in six.iteritems(v):
-                                log("adding section '%s'" % (section),
-                                    level=DEBUG)
-                                ctxt[k][section] = config_dict
-                        else:
-                            ctxt[k] = v
-
-        log("%d section(s) found" % (len(ctxt['sections'])), level=DEBUG)
-        return ctxt
-
-
-class LogLevelContext(OSContextGenerator):
-
-    def __call__(self):
-        ctxt = {}
-        ctxt['debug'] = \
-            False if config('debug') is None else config('debug')
-        ctxt['verbose'] = \
-            False if config('verbose') is None else config('verbose')
-
-        return ctxt
-
-
-class SyslogContext(OSContextGenerator):
-
-    def __call__(self):
-        ctxt = {'use_syslog': config('use-syslog')}
-        return ctxt
-
-
-class BindHostContext(OSContextGenerator):
-
-    def __call__(self):
-        if config('prefer-ipv6'):
-            return {'bind_host': '::'}
-        else:
-            return {'bind_host': '0.0.0.0'}
-
-
-class WorkerConfigContext(OSContextGenerator):
-
-    @property
-    def num_cpus(self):
-        try:
-            from psutil import NUM_CPUS
-        except ImportError:
-            apt_install('python-psutil', fatal=True)
-            from psutil import NUM_CPUS
-
-        return NUM_CPUS
-
-    def __call__(self):
-        multiplier = config('worker-multiplier') or 0
-        ctxt = {"workers": self.num_cpus * multiplier}
-        return ctxt
-
-
-class ZeroMQContext(OSContextGenerator):
-    interfaces = ['zeromq-configuration']
-
-    def __call__(self):
-        ctxt = {}
-        if is_relation_made('zeromq-configuration', 'host'):
-            for rid in relation_ids('zeromq-configuration'):
-                    for unit in related_units(rid):
-                        ctxt['zmq_nonce'] = relation_get('nonce', unit, rid)
-                        ctxt['zmq_host'] = relation_get('host', unit, rid)
-                        ctxt['zmq_redis_address'] = relation_get(
-                            'zmq_redis_address', unit, rid)
-
-        return ctxt
-
-
-class NotificationDriverContext(OSContextGenerator):
-
-    def __init__(self, zmq_relation='zeromq-configuration',
-                 amqp_relation='amqp'):
-        """
-        :param zmq_relation: Name of Zeromq relation to check
-        """
-        self.zmq_relation = zmq_relation
-        self.amqp_relation = amqp_relation
-
-    def __call__(self):
-        ctxt = {'notifications': 'False'}
-        if is_relation_made(self.amqp_relation):
-            ctxt['notifications'] = "True"
-
-        return ctxt
-
-
-class SysctlContext(OSContextGenerator):
-    """This context check if the 'sysctl' option exists on configuration
-    then creates a file with the loaded contents"""
-    def __call__(self):
-        sysctl_dict = config('sysctl')
-        if sysctl_dict:
-            sysctl_create(sysctl_dict,
-                          '/etc/sysctl.d/50-{0}.conf'.format(charm_name()))
-        return {'sysctl': sysctl_dict}
-
-
-class NeutronAPIContext(OSContextGenerator):
-    '''
-    Inspects current neutron-plugin-api relation for neutron settings. Return
-    defaults if it is not present.
-    '''
-    interfaces = ['neutron-plugin-api']
-
-    def __call__(self):
-        self.neutron_defaults = {
-            'l2_population': {
-                'rel_key': 'l2-population',
-                'default': False,
-            },
-            'overlay_network_type': {
-                'rel_key': 'overlay-network-type',
-                'default': 'gre',
-            },
-            'neutron_security_groups': {
-                'rel_key': 'neutron-security-groups',
-                'default': False,
-            },
-            'network_device_mtu': {
-                'rel_key': 'network-device-mtu',
-                'default': None,
-            },
-            'enable_dvr': {
-                'rel_key': 'enable-dvr',
-                'default': False,
-            },
-            'enable_l3ha': {
-                'rel_key': 'enable-l3ha',
-                'default': False,
-            },
-        }
-        ctxt = self.get_neutron_options({})
-        for rid in relation_ids('neutron-plugin-api'):
-            for unit in related_units(rid):
-                rdata = relation_get(rid=rid, unit=unit)
-                if 'l2-population' in rdata:
-                    ctxt.update(self.get_neutron_options(rdata))
-
-        return ctxt
-
-    def get_neutron_options(self, rdata):
-        settings = {}
-        for nkey in self.neutron_defaults.keys():
-            defv = self.neutron_defaults[nkey]['default']
-            rkey = self.neutron_defaults[nkey]['rel_key']
-            if rkey in rdata.keys():
-                if type(defv) is bool:
-                    settings[nkey] = bool_from_string(rdata[rkey])
-                else:
-                    settings[nkey] = rdata[rkey]
-            else:
-                settings[nkey] = defv
-        return settings
-
-
-class ExternalPortContext(NeutronPortContext):
-
-    def __call__(self):
-        ctxt = {}
-        ports = config('ext-port')
-        if ports:
-            ports = [p.strip() for p in ports.split()]
-            ports = self.resolve_ports(ports)
-            if ports:
-                ctxt = {"ext_port": ports[0]}
-                napi_settings = NeutronAPIContext()()
-                mtu = napi_settings.get('network_device_mtu')
-                if mtu:
-                    ctxt['ext_port_mtu'] = mtu
-
-        return ctxt
-
-
-class DataPortContext(NeutronPortContext):
-
-    def __call__(self):
-        ports = config('data-port')
-        if ports:
-            portmap = parse_data_port_mappings(ports)
-            ports = portmap.values()
-            resolved = self.resolve_ports(ports)
-            normalized = {get_nic_hwaddr(port): port for port in resolved
-                          if port not in ports}
-            normalized.update({port: port for port in resolved
-                               if port in ports})
-            if resolved:
-                return {bridge: normalized[port] for bridge, port in
-                        six.iteritems(portmap) if port in normalized.keys()}
-
-        return None
-
-
-class PhyNICMTUContext(DataPortContext):
-
-    def __call__(self):
-        ctxt = {}
-        mappings = super(PhyNICMTUContext, self).__call__()
-        if mappings and mappings.values():
-            ports = mappings.values()
-            napi_settings = NeutronAPIContext()()
-            mtu = napi_settings.get('network_device_mtu')
-            if mtu:
-                ctxt["devs"] = '\\n'.join(ports)
-                ctxt['mtu'] = mtu
-
-        return ctxt
-
-
-class NetworkServiceContext(OSContextGenerator):
-
-    def __init__(self, rel_name='quantum-network-service'):
-        self.rel_name = rel_name
-        self.interfaces = [rel_name]
-
-    def __call__(self):
-        for rid in relation_ids(self.rel_name):
-            for unit in related_units(rid):
-                rdata = relation_get(rid=rid, unit=unit)
-                ctxt = {
-                    'keystone_host': rdata.get('keystone_host'),
-                    'service_port': rdata.get('service_port'),
-                    'auth_port': rdata.get('auth_port'),
-                    'service_tenant': rdata.get('service_tenant'),
-                    'service_username': rdata.get('service_username'),
-                    'service_password': rdata.get('service_password'),
-                    'quantum_host': rdata.get('quantum_host'),
-                    'quantum_port': rdata.get('quantum_port'),
-                    'quantum_url': rdata.get('quantum_url'),
-                    'region': rdata.get('region'),
-                    'service_protocol':
-                    rdata.get('service_protocol') or 'http',
-                    'auth_protocol':
-                    rdata.get('auth_protocol') or 'http',
-                }
-                if context_complete(ctxt):
-                    return ctxt
-        return {}

=== removed directory 'hooks/charmhelpers/contrib/openstack/files'
=== removed file 'hooks/charmhelpers/contrib/openstack/files/__init__.py'
--- hooks/charmhelpers/contrib/openstack/files/__init__.py	2015-02-19 05:17:57 +0000
+++ hooks/charmhelpers/contrib/openstack/files/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-# dummy __init__.py to fool syncer into thinking this is a syncable python
-# module

=== removed file 'hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh'
--- hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh	2015-02-25 23:34:09 +0000
+++ hooks/charmhelpers/contrib/openstack/files/check_haproxy.sh	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/bin/bash
-#--------------------------------------------
-# This file is managed by Juju
-#--------------------------------------------
-#
-# Copyright 2009,2012 Canonical Ltd.
-# Author: Tom Haddon
-
-CRITICAL=0
-NOTACTIVE=''
-LOGFILE=/var/log/nagios/check_haproxy.log
-AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
-
-for appserver in $(grep '    server' /etc/haproxy/haproxy.cfg | awk '{print $2'});
-do
-    output=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 --regex="class=\"(active|backup)(2|3).*${appserver}" -e ' 200 OK')
-    if [ $? != 0 ]; then
-        date >> $LOGFILE
-        echo $output >> $LOGFILE
-        /usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 -v | grep $appserver >> $LOGFILE 2>&1
-        CRITICAL=1
-        NOTACTIVE="${NOTACTIVE} $appserver"
-    fi
-done
-
-if [ $CRITICAL = 1 ]; then
-    echo "CRITICAL:${NOTACTIVE}"
-    exit 2
-fi
-
-echo "OK: All haproxy instances looking good"
-exit 0

=== removed file 'hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh'
--- hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh	2015-02-25 23:34:09 +0000
+++ hooks/charmhelpers/contrib/openstack/files/check_haproxy_queue_depth.sh	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/bin/bash
-#--------------------------------------------
-# This file is managed by Juju
-#--------------------------------------------
-#                                       
-# Copyright 2009,2012 Canonical Ltd.
-# Author: Tom Haddon
-
-# These should be config options at some stage
-CURRQthrsh=0
-MAXQthrsh=100
-
-AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
-
-HAPROXYSTATS=$(/usr/lib/nagios/plugins/check_http -a ${AUTH} -I 127.0.0.1 -p 8888 -u '/;csv' -v)
-
-for BACKEND in $(echo $HAPROXYSTATS| xargs -n1 | grep BACKEND | awk -F , '{print $1}')
-do
-    CURRQ=$(echo "$HAPROXYSTATS" | grep $BACKEND | grep BACKEND | cut -d , -f 3)
-    MAXQ=$(echo "$HAPROXYSTATS"  | grep $BACKEND | grep BACKEND | cut -d , -f 4)
-
-    if [[ $CURRQ -gt $CURRQthrsh || $MAXQ -gt $MAXQthrsh ]] ; then
-        echo "CRITICAL: queue depth for $BACKEND - CURRENT:$CURRQ MAX:$MAXQ"
-        exit 2
-    fi
-done
-
-echo "OK: All haproxy queue depths looking good"
-exit 0
-

=== removed file 'hooks/charmhelpers/contrib/openstack/ip.py'
--- hooks/charmhelpers/contrib/openstack/ip.py	2015-03-31 15:13:53 +0000
+++ hooks/charmhelpers/contrib/openstack/ip.py	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-from charmhelpers.core.hookenv import (
-    config,
-    unit_get,
-)
-from charmhelpers.contrib.network.ip import (
-    get_address_in_network,
-    is_address_in_network,
-    is_ipv6,
-    get_ipv6_addr,
-)
-from charmhelpers.contrib.hahelpers.cluster import is_clustered
-
-from functools import partial
-
-PUBLIC = 'public'
-INTERNAL = 'int'
-ADMIN = 'admin'
-
-ADDRESS_MAP = {
-    PUBLIC: {
-        'config': 'os-public-network',
-        'fallback': 'public-address'
-    },
-    INTERNAL: {
-        'config': 'os-internal-network',
-        'fallback': 'private-address'
-    },
-    ADMIN: {
-        'config': 'os-admin-network',
-        'fallback': 'private-address'
-    }
-}
-
-
-def canonical_url(configs, endpoint_type=PUBLIC):
-    """Returns the correct HTTP URL to this host given the state of HTTPS
-    configuration, hacluster and charm configuration.
-
-    :param configs: OSTemplateRenderer config templating object to inspect
-                    for a complete https context.
-    :param endpoint_type: str endpoint type to resolve.
-    :param returns: str base URL for services on the current service unit.
-    """
-    scheme = 'http'
-    if 'https' in configs.complete_contexts():
-        scheme = 'https'
-    address = resolve_address(endpoint_type)
-    if is_ipv6(address):
-        address = "[{}]".format(address)
-    return '%s://%s' % (scheme, address)
-
-
-def resolve_address(endpoint_type=PUBLIC):
-    """Return unit address depending on net config.
-
-    If unit is clustered with vip(s) and has net splits defined, return vip on
-    correct network. If clustered with no nets defined, return primary vip.
-
-    If not clustered, return unit address ensuring address is on configured net
-    split if one is configured.
-
-    :param endpoint_type: Network endpoing type
-    """
-    resolved_address = None
-    vips = config('vip')
-    if vips:
-        vips = vips.split()
-
-    net_type = ADDRESS_MAP[endpoint_type]['config']
-    net_addr = config(net_type)
-    net_fallback = ADDRESS_MAP[endpoint_type]['fallback']
-    clustered = is_clustered()
-    if clustered:
-        if not net_addr:
-            # If no net-splits defined, we expect a single vip
-            resolved_address = vips[0]
-        else:
-            for vip in vips:
-                if is_address_in_network(net_addr, vip):
-                    resolved_address = vip
-                    break
-    else:
-        if config('prefer-ipv6'):
-            fallback_addr = get_ipv6_addr(exc_list=vips)[0]
-        else:
-            fallback_addr = unit_get(net_fallback)
-
-        resolved_address = get_address_in_network(net_addr, fallback_addr)
-
-    if resolved_address is None:
-        raise ValueError("Unable to resolve a suitable IP address based on "
-                         "charm state and configuration. (net_type=%s, "
-                         "clustered=%s)" % (net_type, clustered))
-
-    return resolved_address
-
-
-def endpoint_url(configs, url_template, port, endpoint_type=PUBLIC,
-                 override=None):
-    """Returns the correct endpoint URL to advertise to Keystone.
-
-    This method provides the correct endpoint URL which should be advertised to
-    the keystone charm for endpoint creation. This method allows for the url to
-    be overridden to force a keystone endpoint to have specific URL for any of
-    the defined scopes (admin, internal, public).
-
-    :param configs: OSTemplateRenderer config templating object to inspect
-                    for a complete https context.
-    :param url_template: str format string for creating the url template. Only
-                         two values will be passed - the scheme+hostname
-                        returned by the canonical_url and the port.
-    :param endpoint_type: str endpoint type to resolve.
-    :param override: str the name of the config option which overrides the
-                     endpoint URL defined by the charm itself. None will
-                     disable any overrides (default).
-    """
-    if override:
-        # Return any user-defined overrides for the keystone endpoint URL.
-        user_value = config(override)
-        if user_value:
-            return user_value.strip()
-
-    return url_template % (canonical_url(configs, endpoint_type), port)
-
-
-public_endpoint = partial(endpoint_url, endpoint_type=PUBLIC)
-
-internal_endpoint = partial(endpoint_url, endpoint_type=INTERNAL)
-
-admin_endpoint = partial(endpoint_url, endpoint_type=ADMIN)

=== removed file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2015-04-16 20:07:38 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	1970-01-01 00:00:00 +0000
@@ -1,322 +0,0 @@
-# Copyright 2014-2015 Canonical Limited.
-#
-# This file is part of charm-helpers.
-#
-# charm-helpers is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3 as
-# published by the Free Software Foundation.
-#
-# charm-helpers is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
-
-# Various utilies for dealing with Neutron and the renaming from Quantum.
-
-import six
-from subprocess import check_output
-
-from charmhelpers.core.hookenv import (
-    config,
-    log,
-    ERROR,
-)
-
-from charmhelpers.contrib.openstack.utils import os_release
-
-
-def headers_package():
-    """Ensures correct linux-headers for running kernel are installed,
-    for building DKMS package"""
-    kver = check_output(['uname', '-r']).decode('UTF-8').strip()
-    return 'linux-headers-%s' % kver
-
-QUANTUM_CONF_DIR = '/etc/quantum'
-
-
-def kernel_version():