Juju Charms Collection
neutron-api package

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

  1. Trusty Tahr (14.04)
  2. subordinate-plugins
  3. Merge into vpp
Proposed by James Page
Status: Merged
Merged at revision: 129
Proposed branch: lp:~james-page/charms/trusty/neutron-api/subordinate-plugins
Merge into: lp:~openstack-charmers/charms/trusty/neutron-api/vpp
Diff against target: 43 lines (+3/-11)
2 files modified
files/patched-icehouse (+0/-4)
hooks/neutron_api_hooks.py (+3/-7)
To merge this branch: bzr merge lp:~james-page/charms/trusty/neutron-api/subordinate-plugins
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+264849@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'files/patched-icehouse'
2--- files/patched-icehouse 2015-07-08 08:19:34 +0000
3+++ files/patched-icehouse 1970-01-01 00:00:00 +0000
4@@ -1,4 +0,0 @@
5-[ /etc/apt/preferences.d/patched-icehouse ]
6-Package: *
7-Pin: release o=LP-PPA-sdn-charmers-cisco-vpp-testing
8-Pin-Priority: 990
9
10=== modified file 'hooks/neutron_api_hooks.py'
11--- hooks/neutron_api_hooks.py 2015-07-14 10:18:26 +0000
12+++ hooks/neutron_api_hooks.py 2015-07-15 14:10:48 +0000
13@@ -9,7 +9,6 @@
14 from charmhelpers.core.hookenv import (
15 Hooks,
16 UnregisteredHookError,
17- charm_dir,
18 config,
19 is_relation_made,
20 local_unit,
21@@ -144,11 +143,7 @@
22 def install():
23 execd_preinstall()
24 configure_installation_source(config('openstack-origin'))
25- # XXX Remove me when patched nova and neutron are in the main ppa
26- configure_installation_source('ppa:sdn-charmers/cisco-vpp-testing')
27- apt_pin_file = charm_dir() + '/files/patched-icehouse'
28- import shutil
29- shutil.copyfile(apt_pin_file, '/etc/apt/preferences.d/patched-icehouse')
30+
31 apt_update()
32 apt_install(determine_packages(config('openstack-origin')),
33 fatal=True)
34@@ -484,7 +479,8 @@
35 users="neutron")
36
37
38-@hooks.hook('zeromq-configuration-relation-changed')
39+@hooks.hook('zeromq-configuration-relation-changed',
40+ 'neutron-plugin-api-subordinate-relation-changed')
41 @restart_on_change(restart_map(), stopstart=True)
42 def zeromq_configuration_relation_changed():
43 CONFIGS.write_all()

Subscribers

People subscribed via source and target branches

to all changes: