Merge lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq into lp:~openstack-charmers-archive/charms/trusty/neutron-openvswitch/next

[Liam Young]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#692 neutron-openvswitch-next for gnuoy mp238874
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/692/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq/+merge/238874

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Results summary:
    LINT FAIL: lint-check failed

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.692:
hooks/neutron_ovs_utils.py:73:1: W391 blank line at end of file
make: *** [lint] Error 1

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#498 neutron-openvswitch-next for gnuoy mp238874
charm_unit_test

This build:
http://10.98.191.181:8080/job/charm_unit_test/498/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq/+merge/238874

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Results summary:
    UNIT FAIL: unit-test failed

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.498:
   'neutron_alchemy_flags': {},
   'neutron_plugin': 'ovs',
- 'neutron_security_groups': 'yes',
? ^^ --

+ 'neutron_security_groups': None,
? ^^^

   'neutron_url': 'https://127.0.0.13:9696',
   'overlay_network_type': 'gre',
   'use_syslog': True,
   'verbose': True}

Name Stmts Miss Cover Missing
---------------------------------------------------------
hooks/neutron_ovs_context 67 6 91% 34, 41, 57-58, 75, 92
hooks/neutron_ovs_hooks 40 5 88% 52, 75, 83, 87-88
hooks/neutron_ovs_utils 36 9 75% 64-72
---------------------------------------------------------
TOTAL 143 20 86%
----------------------------------------------------------------------
Ran 13 tests in 0.244s

FAILED (errors=5, failures=1)
make: *** [test] Error 1

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#249 neutron-openvswitch-next for gnuoy mp238874
charm_amulet_test

This build:
http://10.98.191.181:8080/job/charm_amulet_test/249/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq/+merge/238874

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Results summary:
    AMULET FAIL: amulet-test missing

AMULET Results not found.

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

45. By Liam Young on 2014-10-20

Fix lint and unit tests

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#257 neutron-openvswitch-next for gnuoy mp238874
charm_amulet_test

This build:
http://10.98.191.181:8080/job/charm_amulet_test/257/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq/+merge/238874

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Results summary:
    AMULET FAIL: amulet-test missing

AMULET Results not found.

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#506 neutron-openvswitch-next for gnuoy mp238874
charm_unit_test

This build:
http://10.98.191.181:8080/job/charm_unit_test/506/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq/+merge/238874

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Results summary:
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.506:
Starting tests...
.............
Name Stmts Miss Cover Missing
---------------------------------------------------------
hooks/neutron_ovs_context 67 4 94% 34, 41, 75, 92
hooks/neutron_ovs_hooks 40 4 90% 75, 83, 87-88
hooks/neutron_ovs_utils 36 9 75% 64-72
---------------------------------------------------------
TOTAL 143 17 88%
----------------------------------------------------------------------
Ran 13 tests in 0.196s

OK

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.

#700 neutron-openvswitch-next for gnuoy mp238874
charm_lint_check

This build:
http://10.98.191.181:8080/job/charm_lint_check/700/

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/neutron-openvswitch/0mq/+merge/238874

Proposed branch:
lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq

Results summary:
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.700:
I: missing recommended hook start
I: config.yaml: option data-port has no default value
I: config.yaml: option os-data-network has no default value

Ubuntu OSCI Jenkins is currently in development on a Canonical private network, but we plan to publish results to a public instance soon. Tests are triggered if the proposed branch rev changes, or if the MP is placed into "Needs review" status after being otherwise for >= 1hr. Human review of results is still recommended.
http://10.98.191.181:8080/

[James Page (james-page)]

review: Needs Fixing

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

46. By James Page on 2014-12-15

Rebase on next

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #163 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/163/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #197 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/197/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #177 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: no-tear-down-replace failed
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9527361/
Build: http://10.245.162.77:8080/job/charm_amulet_test/177/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

47. By James Page on 2015-01-13

Resync helpers

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #736 neutron-openvswitch-next for gnuoy mp238874
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
  FAILED (errors=3)
  make: *** [unit_test] Error 1

Full unit test output: http://paste.ubuntu.com/9727328/
Build: http://10.245.162.77:8080/job/charm_unit_test/736/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #707 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/707/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #892 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9727330/
Build: http://10.245.162.77:8080/job/charm_amulet_test/892/

[Ryan Beisner (1chb1n)]

All T, U & J deploy tests fail with:

http://10.245.162.77:8080/view/Dashboard%3A%20Deploy/job/deploy_with_deployer/1248/artifact/

11:11:08 2015-01-13 11:11:08 [DEBUG] deployer.env: Delta unit: neutron-openvswitch/1 change:error
11:11:08 2015-01-13 11:11:08 [ERROR] deployer.env: The following units had errors:
11:11:08 unit: neutron-openvswitch/1: machine: agent-state: error details: hook failed: "install"
11:11:08 2015-01-13 11:11:08 [INFO] deployer.cli: Deployment stopped. run time: 624.02

unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO juju.worker.uniter uniter.go:480 running "install" hook
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install Traceback (most recent call last):
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install File "/var/lib/juju/agents/unit-neutron-openvswitch-1/charm/hooks/install", line 26, in <module>
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install from neutron_ovs_utils import (
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install File "/var/lib/juju/agents/unit-neutron-openvswitch-1/charm/hooks/neutron_ovs_utils.py", line 4, in <module>
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install from charmhelpers.contrib.openstack import context, templating
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install File "/var/lib/juju/agents/unit-neutron-openvswitch-1/charm/hooks/charmhelpers/contrib/openstack/context.py", line 37, in <module>
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install from charmhelpers.contrib.hahelpers.cluster import (
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install File "/var/lib/juju/agents/unit-neutron-openvswitch-1/charm/hooks/charmhelpers/contrib/hahelpers/cluster.py", line 32, in <module>
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install from charmhelpers.core.decorators import (
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 INFO install ImportError: No module named decorators
unit-neutron-openvswitch-1: 2015-01-13 11:11:04 ERROR juju.worker.uniter uniter.go:486 hook failed: exit status 1

review: Needs Fixing

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

48. By James Page on 2015-01-16

Add missing files

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #821 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/821/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #792 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/792/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #977 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9761609/
Build: http://10.245.162.77:8080/job/charm_amulet_test/977/

[Ryan Beisner (1chb1n)]

FYI - P, T, U deploy tests fail with: http://paste.ubuntu.com/9761874/

review: Needs Fixing

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

49. By James Page on 2015-01-19

Use centralized zeromq template

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #868 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/868/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #839 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/839/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1063 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9783626/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1063/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

50. By James Page on 2015-01-19

Fixup zeromq sections

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #844 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/844/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #873 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/873/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1068 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9783949/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1068/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

51. By James Page on 2015-01-20

Resync helper

52. By James Page on 2015-01-20

Resync helper

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #866 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/866/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #895 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/895/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1090 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9793802/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1090/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #902 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/902/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #873 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/873/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #1097 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/9793982/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1097/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

53. By James Page on 2015-02-24

Switch back to trunk charm-helpers

54. By James Page on 2015-02-24

Rebase and resync

55. By James Page on 2015-02-24

Specialize configuration for juno + zeromq

56. By James Page on 2015-02-24

Update headers for templates

57. By James Page on 2015-02-24

Add kilo zeromq template

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1990 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/1990/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2201 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2201/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2147 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10396179/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2147/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

58. By James Page on 2015-03-16

Rebase

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2680 neutron-openvswitch-next for gnuoy mp238874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2680/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #2471 neutron-openvswitch-next for gnuoy mp238874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2471/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #2509 neutron-openvswitch-next for gnuoy mp238874
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  ERROR subprocess encountered error code 1
  make: *** [test] Error 1

Full amulet test output: http://paste.ubuntu.com/10610123/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2509/

[lp:~openstack-charmers/charms/trusty/neutron-openvswitch/0mq]

59. By James Page on 2015-03-16

Make 0mq support >= kilo

60. By James Page on 2015-03-30

Rebase, resync

61. By James Page on 2015-04-01

Sortout topic registration

62. By James Page on 2015-04-01

Rebase

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-02-16 11:16:11 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-01 14:19:25 +0000
@@ -15,6 +15,7 @@
 # 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
 )
@@ -100,12 +101,34 @@
            """
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse) = range(6)
+         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
         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', None): self.trusty_icehouse,
+            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
+            ('trusty', 'cloud:trusty-kilo'): self.trusty_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]

=== added file 'hooks/charmhelpers/contrib/openstack/templates/git.upstart'
--- hooks/charmhelpers/contrib/openstack/templates/git.upstart	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/git.upstart	2015-04-01 14:19:25 +0000
@@ -0,0 +1,13 @@
+description "{{ service_description }}"
+author "Juju {{ service_name }} Charm <juju@localhost>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+exec start-stop-daemon --start --chuid {{ user_name }} \
+            --chdir {{ start_dir }} --name {{ process_name }} \
+            --exec {{ executable_name }} -- \
+            --config-file={{ config_file }} \
+            --log-file={{ log_file }}

=== added file 'hooks/charmhelpers/contrib/openstack/templates/section-zeromq'
--- hooks/charmhelpers/contrib/openstack/templates/section-zeromq	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/section-zeromq	2015-04-01 14:19:25 +0000
@@ -0,0 +1,14 @@
+{% if zmq_host -%}
+# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
+rpc_backend = zmq
+rpc_zmq_host = {{ zmq_host }}
+{% if zmq_redis_address -%}
+rpc_zmq_matchmaker = redis
+matchmaker_heartbeat_freq = 15
+matchmaker_heartbeat_ttl = 30
+[matchmaker_redis]
+host = {{ zmq_redis_address }}
+{% else -%}
+rpc_zmq_matchmaker = ring
+{% endif -%}
+{% endif -%}

=== removed file 'hooks/charmhelpers/contrib/openstack/templates/zeromq'
--- hooks/charmhelpers/contrib/openstack/templates/zeromq	2015-03-04 09:52:38 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/zeromq	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-{% if zmq_host -%}
-# ZeroMQ configuration (restart-nonce: {{ zmq_nonce }})
-rpc_backend = zmq
-rpc_zmq_host = {{ zmq_host }}
-{% if zmq_redis_address -%}
-rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_redis.MatchMakerRedis
-matchmaker_heartbeat_freq = 15
-matchmaker_heartbeat_ttl = 30
-[matchmaker_redis]
-host = {{ zmq_redis_address }}
-{% else -%}
-rpc_zmq_matchmaker = oslo.messaging._drivers.matchmaker_ring.MatchMakerRing
-{% endif -%}
-{% endif -%}

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-03-25 09:49:01 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-04-01 14:19:25 +0000
@@ -30,6 +30,10 @@
 
 from charmhelpers.contrib.network import ip
 
+from charmhelpers.core import (
+    unitdata,
+)
+
 from charmhelpers.core.hookenv import (
     config,
     log as juju_log,
@@ -330,6 +334,21 @@
         error_out("Invalid openstack-release specified: %s" % rel)
 
 
+def config_value_changed(option):
+    """
+    Determine if config value changed since last call to this function.
+    """
+    hook_data = unitdata.HookData()
+    with hook_data():
+        db = unitdata.kv()
+        current = config(option)
+        saved = db.get(option)
+        db.set(option, current)
+        if saved is None:
+            return False
+        return current != saved
+
+
 def save_script_rc(script_path="scripts/scriptrc", **env_vars):
     """
     Write an rc file in the charm-delivered directory containing
@@ -469,82 +488,95 @@
 
 
 def git_install_requested():
-    """Returns true if openstack-origin-git is specified."""
-    return config('openstack-origin-git') != "None"
+    """
+    Returns true if openstack-origin-git is specified.
+    """
+    return config('openstack-origin-git') is not None
 
 
 requirements_dir = None
 
 
-def git_clone_and_install(file_name, core_project):
-    """Clone/install all OpenStack repos specified in yaml config file."""
+def git_clone_and_install(projects_yaml, core_project):
+    """
+    Clone/install all specified OpenStack repositories.
+
+    The expected format of projects_yaml is:
+        repositories:
+          - {name: keystone,
+             repository: 'git://git.openstack.org/openstack/keystone.git',
+             branch: 'stable/icehouse'}
+          - {name: requirements,
+             repository: 'git://git.openstack.org/openstack/requirements.git',
+             branch: 'stable/icehouse'}
+        directory: /mnt/openstack-git
+
+        The directory key is optional.
+    """
     global requirements_dir
+    parent_dir = '/mnt/openstack-git'
 
-    if file_name == "None":
+    if not projects_yaml:
         return
 
-    yaml_file = os.path.join(charm_dir(), file_name)
-
-    # clone/install the requirements project first
-    installed = _git_clone_and_install_subset(yaml_file,
-                                              whitelist=['requirements'])
-    if 'requirements' not in installed:
-        error_out('requirements git repository must be specified')
-
-    # clone/install all other projects except requirements and the core project
-    blacklist = ['requirements', core_project]
-    _git_clone_and_install_subset(yaml_file, blacklist=blacklist,
-                                  update_requirements=True)
-
-    # clone/install the core project
-    whitelist = [core_project]
-    installed = _git_clone_and_install_subset(yaml_file, whitelist=whitelist,
-                                              update_requirements=True)
-    if core_project not in installed:
-        error_out('{} git repository must be specified'.format(core_project))
-
-
-def _git_clone_and_install_subset(yaml_file, whitelist=[], blacklist=[],
-                                  update_requirements=False):
-    """Clone/install subset of OpenStack repos specified in yaml config file."""
-    global requirements_dir
-    installed = []
-
-    with open(yaml_file, 'r') as fd:
-        projects = yaml.load(fd)
-        for proj, val in projects.items():
-            # The project subset is chosen based on the following 3 rules:
-            # 1) If project is in blacklist, we don't clone/install it, period.
-            # 2) If whitelist is empty, we clone/install everything else.
-            # 3) If whitelist is not empty, we clone/install everything in the
-            #    whitelist.
-            if proj in blacklist:
-                continue
-            if whitelist and proj not in whitelist:
-                continue
-            repo = val['repository']
-            branch = val['branch']
-            repo_dir = _git_clone_and_install_single(repo, branch,
-                                                     update_requirements)
-            if proj == 'requirements':
-                requirements_dir = repo_dir
-            installed.append(proj)
-    return installed
-
-
-def _git_clone_and_install_single(repo, branch, update_requirements=False):
-    """Clone and install a single git repository."""
-    dest_parent_dir = "/mnt/openstack-git/"
-    dest_dir = os.path.join(dest_parent_dir, os.path.basename(repo))
-
-    if not os.path.exists(dest_parent_dir):
-        juju_log('Host dir not mounted at {}. '
-                 'Creating directory there instead.'.format(dest_parent_dir))
-        os.mkdir(dest_parent_dir)
+    projects = yaml.load(projects_yaml)
+    _git_validate_projects_yaml(projects, core_project)
+
+    if 'directory' in projects.keys():
+        parent_dir = projects['directory']
+
+    for p in projects['repositories']:
+        repo = p['repository']
+        branch = p['branch']
+        if p['name'] == 'requirements':
+            repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
+                                                     update_requirements=False)
+            requirements_dir = repo_dir
+        else:
+            repo_dir = _git_clone_and_install_single(repo, branch, parent_dir,
+                                                     update_requirements=True)
+
+
+def _git_validate_projects_yaml(projects, core_project):
+    """
+    Validate the projects yaml.
+    """
+    _git_ensure_key_exists('repositories', projects)
+
+    for project in projects['repositories']:
+        _git_ensure_key_exists('name', project.keys())
+        _git_ensure_key_exists('repository', project.keys())
+        _git_ensure_key_exists('branch', project.keys())
+
+    if projects['repositories'][0]['name'] != 'requirements':
+        error_out('{} git repo must be specified first'.format('requirements'))
+
+    if projects['repositories'][-1]['name'] != core_project:
+        error_out('{} git repo must be specified last'.format(core_project))
+
+
+def _git_ensure_key_exists(key, keys):
+    """
+    Ensure that key exists in keys.
+    """
+    if key not in keys:
+        error_out('openstack-origin-git key \'{}\' is missing'.format(key))
+
+
+def _git_clone_and_install_single(repo, branch, parent_dir, update_requirements):
+    """
+    Clone and install a single git repository.
+    """
+    dest_dir = os.path.join(parent_dir, os.path.basename(repo))
+
+    if not os.path.exists(parent_dir):
+        juju_log('Directory already exists at {}. '
+                 'No need to create directory.'.format(parent_dir))
+        os.mkdir(parent_dir)
 
     if not os.path.exists(dest_dir):
         juju_log('Cloning git repo: {}, branch: {}'.format(repo, branch))
-        repo_dir = install_remote(repo, dest=dest_parent_dir, branch=branch)
+        repo_dir = install_remote(repo, dest=parent_dir, branch=branch)
     else:
         repo_dir = dest_dir
 
@@ -561,16 +593,39 @@
 
 
 def _git_update_requirements(package_dir, reqs_dir):
-    """Update from global requirements.
+    """
+    Update from global requirements.
 
-       Update an OpenStack git directory's requirements.txt and
-       test-requirements.txt from global-requirements.txt."""
+    Update an OpenStack git directory's requirements.txt and
+    test-requirements.txt from global-requirements.txt.
+    """
     orig_dir = os.getcwd()
     os.chdir(reqs_dir)
-    cmd = "python update.py {}".format(package_dir)
+    cmd = ['python', 'update.py', package_dir]
     try:
-        subprocess.check_call(cmd.split(' '))
+        subprocess.check_call(cmd)
     except subprocess.CalledProcessError:
         package = os.path.basename(package_dir)
         error_out("Error updating {} from global-requirements.txt".format(package))
     os.chdir(orig_dir)
+
+
+def git_src_dir(projects_yaml, project):
+    """
+    Return the directory where the specified project's source is located.
+    """
+    parent_dir = '/mnt/openstack-git'
+
+    if not projects_yaml:
+        return
+
+    projects = yaml.load(projects_yaml)
+
+    if 'directory' in projects.keys():
+        parent_dir = projects['directory']
+
+    for p in projects['repositories']:
+        if p['name'] == project:
+            return os.path.join(parent_dir, os.path.basename(p['repository']))
+
+    return None

=== modified file 'hooks/charmhelpers/core/unitdata.py'
--- hooks/charmhelpers/core/unitdata.py	2015-02-16 11:22:05 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-04-01 14:19:25 +0000
@@ -443,7 +443,7 @@
         data = hookenv.execution_environment()
         self.conf = conf_delta = self.kv.delta(data['conf'], 'config')
         self.rels = rels_delta = self.kv.delta(data['rels'], 'rels')
-        self.kv.set('env', data['env'])
+        self.kv.set('env', dict(data['env']))
         self.kv.set('unit', data['unit'])
         self.kv.set('relid', data.get('relid'))
         return conf_delta, rels_delta

=== modified file 'hooks/neutron_ovs_hooks.py'
--- hooks/neutron_ovs_hooks.py	2015-04-01 12:53:02 +0000
+++ hooks/neutron_ovs_hooks.py	2015-04-01 14:19:25 +0000
@@ -19,10 +19,15 @@
     apt_install, apt_update, apt_purge
 )
 
+from charmhelpers.contrib.openstack.utils import (
+    os_requires_version,
+)
+
 from neutron_ovs_utils import (
     DVR_PACKAGES,
     configure_ovs,
     determine_packages,
+    get_topics,
     determine_dvr_packages,
     get_shared_secret,
     register_configs,
@@ -51,6 +56,8 @@
         apt_install(determine_dvr_packages(), fatal=True)
     configure_ovs()
     CONFIGS.write_all()
+    for rid in relation_ids('zeromq-configuration'):
+        zeromq_configuration_relation_joined(rid)
 
 
 @hooks.hook('neutron-plugin-api-relation-changed')
@@ -94,6 +101,20 @@
     CONFIGS.write_all()
 
 
[e-mail]('zeromq-configuration-relation-joined')
+@os_requires_version('kilo', 'neutron-common')
+def zeromq_configuration_relation_joined(relid=None):
+    relation_set(relation_id=relid,
+                 topics=" ".join(get_topics()),
+                 users="neutron")
+
+
[e-mail]('zeromq-configuration-relation-changed')
+@restart_on_change(restart_map(), stopstart=True)
+def zeromq_configuration_relation_changed():
+    CONFIGS.write_all()
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/neutron_ovs_utils.py'
--- hooks/neutron_ovs_utils.py	2015-03-31 14:33:06 +0000
+++ hooks/neutron_ovs_utils.py	2015-04-01 14:19:25 +0000
@@ -44,7 +44,9 @@
     (NEUTRON_CONF, {
         'services': ['neutron-plugin-openvswitch-agent'],
         'contexts': [neutron_ovs_context.OVSPluginContext(),
-                     context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR)],
+                     context.AMQPContext(ssl_dir=NEUTRON_CONF_DIR),
+                     context.ZeroMQContext(),
+                     context.NotificationDriverContext()],
     }),
     (ML2_CONF, {
         'services': ['neutron-plugin-openvswitch-agent'],
@@ -122,6 +124,18 @@
     return {k: v['services'] for k, v in resource_map().iteritems()}
 
 
+def get_topics():
+    topics = []
+    topics.append('q-agent-notifier-port-update')
+    topics.append('q-agent-notifier-network-delete')
+    topics.append('q-agent-notifier-tunnel-update')
+    topics.append('q-agent-notifier-security_group-update')
+    topics.append('q-agent-notifier-dvr-update')
+    if context.NeutronAPIContext()()['l2_population']:
+        topics.append('q-agent-notifier-l2population-update')
+    return topics
+
+
 def configure_ovs():
     if not service_running('openvswitch-switch'):
         full_restart()

=== added symlink 'hooks/zeromq-configuration-relation-changed'
=== target is u'neutron_ovs_hooks.py'
=== added symlink 'hooks/zeromq-configuration-relation-joined'
=== target is u'neutron_ovs_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-03-31 14:33:06 +0000
+++ metadata.yaml	2015-04-01 14:19:25 +0000
@@ -28,3 +28,7 @@
     scope: container
   neutron-plugin-api:
     interface: neutron-plugin-api
+  zeromq-configuration:
+    interface: zeromq-configuration
+    scope: container
+

=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2015-03-24 14:51:19 +0000
+++ templates/icehouse/neutron.conf	2015-04-01 14:19:25 +0000
@@ -21,7 +21,9 @@
 
 api_paste_config = /etc/neutron/api-paste.ini
 auth_strategy = keystone
+{% if notifications == 'True' -%}
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
+{% endif -%}
 default_notification_level = INFO
 notification_topics = notifications
 
@@ -36,4 +38,3 @@
 
 [keystone_authtoken]
 signing_dir = /var/lib/neutron/keystone-signing
-

=== modified file 'templates/kilo/neutron.conf'
--- templates/kilo/neutron.conf	2015-03-25 09:22:37 +0000
+++ templates/kilo/neutron.conf	2015-04-01 14:19:25 +0000
@@ -24,6 +24,8 @@
 default_notification_level = INFO
 notification_topics = notifications
 
+{% include "section-zeromq" %}
+
 {% include "section-rabbitmq-oslo" %}
 
 [QUOTAS]

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-02-16 12:07:08 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-04-01 14:19:25 +0000
@@ -15,6 +15,7 @@
 # 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
 )
@@ -100,12 +101,34 @@
            """
         (self.precise_essex, self.precise_folsom, self.precise_grizzly,
          self.precise_havana, self.precise_icehouse,
-         self.trusty_icehouse) = range(6)
+         self.trusty_icehouse, self.trusty_juno, self.trusty_kilo) = range(8)
         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', None): self.trusty_icehouse,
+            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
+            ('trusty', 'cloud:trusty-kilo'): self.trusty_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]

=== modified file 'unit_tests/test_neutron_ovs_hooks.py'
--- unit_tests/test_neutron_ovs_hooks.py	2015-03-25 10:31:44 +0000
+++ unit_tests/test_neutron_ovs_hooks.py	2015-04-01 14:19:25 +0000
@@ -59,8 +59,11 @@
         ])
 
     def test_config_changed(self):
+        self.relation_ids.return_value = ['relid']
+        _zmq_joined = self.patch('zeromq_configuration_relation_joined')
         self._call_hook('config-changed')
         self.assertTrue(self.CONFIGS.write_all.called)
+        self.assertTrue(_zmq_joined.called_with('relid'))
         self.configure_ovs.assert_called_with()
 
     def test_config_changed_dvr(self):