Remove plugin support as neutron-plugin info is going to stay baked in the charm

hooks/neutron-plugin-relation-broken

@@ -1 +0,0 @@
-quantum_hooks.py

hooks/neutron-plugin-relation-changed

@@ -1 +0,0 @@
-quantum_hooks.py

hooks/neutron-plugin-relation-departed

@@ -1 +0,0 @@
-quantum_hooks.py

hooks/neutron-plugin-relation-joined

@@ -1 +0,0 @@
-quantum_hooks.py

hooks/quantum_contexts.py

@@ -12,8 +12,7 @@ from charmhelpers.core.hookenv import (
     related_units,
     relation_get,
     unit_get,
-    cached,
-    is_relation_made,
+    cached
 )
 from charmhelpers.fetch import (
     apt_install,
@@ -155,8 +154,7 @@ class QuantumGatewayContext(OSContextGenerator):
             'plugin': config('plugin'),
             'debug': config('debug'),
             'verbose': config('verbose'),
-            'instance_mtu': config('instance-mtu'),
-            'neutron_plugin_present': is_relation_made('neutron-plugin'),
+            'instance_mtu': config('instance-mtu')
         }
         return ctxt
 

hooks/quantum_hooks.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 from base64 import b64decode
-import uuid
+
 from charmhelpers.core.hookenv import (
     log, ERROR, WARNING,
     config,
@@ -44,8 +44,7 @@ from quantum_utils import (
     valid_plugin,
     configure_ovs,
     reassign_agent_resources,
-    stop_services,
-    NEUTRON_CONF,
+    stop_services
 )
 
 hooks = Hooks()
@@ -188,17 +187,6 @@ def cluster_departed():
         reassign_agent_resources()
         CONFIGS.write_all()
 
-@hooks.hook('neutron-plugin-relation-joined')
-def neutron_plugin_relation_joined(rid=None, remote_restart=False):
-    rel_settings = {}
-    rel_settings['restart_trigger'] = str(uuid.uuid4())
-    relation_set(relation_id=rid, **rel_settings)
-
-@restart_on_change(restart_map())
-@hooks.hook('neutron-plugin-relation-changed')
-def neutron_plugin_relation_changed():
-    CONFIGS.write(NEUTRON_CONF)
-
 
 @hooks.hook('cluster-relation-broken')
 @hooks.hook('stop')

hooks/quantum_utils.py

@@ -345,13 +345,6 @@ def register_configs():
     else:
         amqp_nova_ctxt = context.AMQPContext(ssl_dir=NOVA_CONF_DIR, rel_name='amqp')
     CONFIG_FILES[name][plugin][NOVA_CONF]['hook_contexts'].append(amqp_nova_ctxt)
-    if is_relation_made('neutron-plugin'):
-        CONFIG_FILES[name][plugin][NEUTRON_CONF]['hook_contexts'].append(context.SubordinateConfigContext(interface='neutron-plugin', service='neutron', config_file=NEUTRON_CONF))
-        # Files which are managed by the plugin
-        ceded_list = ['NEUTRON_OVS_PLUGIN_CONF', 'NEUTRON_ML2_PLUGIN_CONF']
-        for conf in ceded_list:
-            if conf in CONFIG_FILES[name][plugin]:
-                del CONFIG_FILES[name][plugin][conf]
     for conf in CONFIG_FILES[name][plugin]:
         configs.register(conf,
                          CONFIG_FILES[name][plugin][conf]['hook_contexts'])

metadata.yaml

@@ -27,9 +27,6 @@ requires:
     interface: rabbitmq
   amqp-nova:
     interface: rabbitmq
-  neutron-plugin:
-    interface: neutron-plugin
-    scope: container
 peers:
   cluster:
     interface: quantum-gateway-ha

templates/icehouse/neutron.conf

@@ -6,17 +6,10 @@
 verbose = {{ verbose }}
 debug = {{ debug }}
 lock_path = /var/lock/neutron
-{% if neutron_plugin_present == 'False' -%}
-core_plugin =  {{ core_plugin }}
-{% endif -%}
+core_plugin = {{ core_plugin }} 
 {% include "parts/rabbitmq" %}
 control_exchange = neutron
 notification_driver = neutron.openstack.common.notifier.list_notifier
 list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
-{% if sections and 'DEFAULT' in sections -%}
-{% for key, value in sections['DEFAULT'] -%}
-{{ key }} = {{ value }}
-{% endfor -%}
-{% endif -%}
 [agent]
-root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf