Merge lp:~james-page/charms/trusty/neutron-api/subordinate-plugins into lp:~openstack-charmers/charms/trusty/neutron-api/vpp

[James Page]

=== removed file 'files/patched-icehouse'
--- files/patched-icehouse	2015-07-08 08:19:34 +0000
+++ files/patched-icehouse	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[ /etc/apt/preferences.d/patched-icehouse ]
-Package: *
-Pin: release o=LP-PPA-sdn-charmers-cisco-vpp-testing
-Pin-Priority: 990
 
=== modified file 'hooks/neutron_api_hooks.py'
--- hooks/neutron_api_hooks.py	2015-07-14 10:18:26 +0000
+++ hooks/neutron_api_hooks.py	2015-07-15 14:10:48 +0000
@@ -9,7 +9,6 @@
 from charmhelpers.core.hookenv import (
     Hooks,
     UnregisteredHookError,
-    charm_dir,
     config,
     is_relation_made,
     local_unit,
@@ -144,11 +143,7 @@
 def install():
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))
-    # XXX Remove me when patched nova and neutron are in the main ppa
-    configure_installation_source('ppa:sdn-charmers/cisco-vpp-testing')
-    apt_pin_file = charm_dir() + '/files/patched-icehouse'
-    import shutil
-    shutil.copyfile(apt_pin_file, '/etc/apt/preferences.d/patched-icehouse')
+
     apt_update()
     apt_install(determine_packages(config('openstack-origin')),
                 fatal=True)
@@ -484,7 +479,8 @@
                  users="neutron")
 
 
[e-mail]('zeromq-configuration-relation-changed')
[e-mail]('zeromq-configuration-relation-changed',
+            'neutron-plugin-api-subordinate-relation-changed')
 @restart_on_change(restart_map(), stopstart=True)
 def zeromq_configuration_relation_changed():
     CONFIGS.write_all()