Merge lp:~openstack-charmers/charms/trusty/nova-compute/0mq into lp:~openstack-charmers-archive/charms/trusty/nova-compute/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.

#695 nova-compute-next for gnuoy mp238879
charm_lint_check

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

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/nova-compute/0mq/+merge/238879

Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/0mq

Results summary:
    LINT FAIL: lint-check failed

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.695:
hooks/nova_compute_utils.py:93:1: E101 indentation contains mixed spaces and tabs
hooks/nova_compute_utils.py:93:1: W191 indentation contains tabs
hooks/nova_compute_utils.py:93:8: E128 continuation line under-indented for visual indent
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.

#501 nova-compute-next for gnuoy mp238879
charm_unit_test

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

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/nova-compute/0mq/+merge/238879

Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/0mq

Results summary:
    UNIT FAIL: unit-test failed

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.501:
    get_os_codename_install_source(config('openstack-origin')) or
  File "hooks/charmhelpers/core/hookenv.py", line 44, in wrapper
    res = func(*args, **kwargs)
  File "hooks/charmhelpers/core/hookenv.py", line 281, in config
    config_data = json.loads(subprocess.check_output(config_cmd_line))
  File "/usr/lib/python2.7/subprocess.py", line 566, in check_output
    process = Popen(stdout=PIPE, *popenargs, **kwargs)
  File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

Name Stmts Miss Cover Missing
----------------------------------------------------
nova_compute_context 204 70 66% 34-37, 42-43, 61, 65-66, 71, 97, 101, 104, 113, 119-131, 172, 203, 227-229, 241, 256-259, 263-266, 269-272, 293, 320-328, 331-349, 357, 361, 365, 368-370, 376-385
nova_compute_hooks 141 15 89% 81, 99-100, 128, 194, 252, 257-258, 264, 270, 278, 282-285
nova_compute_utils 230 111 52% 163-219, 227, 232-235, 270-272, 279, 283-286, 294-302, 306, 315-324, 337-356, 382-383, 387-388, 407-428, 445-455, 469-470, 474, 479-480
----------------------------------------------------
TOTAL 575 196 66%
----------------------------------------------------------------------
Ran 56 tests in 7.145s

FAILED (SKIP=5, errors=3)
make: *** [unit_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/

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

92. By Liam Young on 2014-10-20

Fix unit tests and lint

[Ryan Beisner (1chb1n)]

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

#703 nova-compute-next for gnuoy mp238879
charm_lint_check

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

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/nova-compute/0mq/+merge/238879

Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/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.703:
W: no README file
I: relation neutron-plugin has no hooks
I: missing recommended hook start
I: missing recommended hook stop
I: config.yaml: option os-data-network has no default value
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-neutron-security-groups has no default value
I: config.yaml: option migration-auth-type 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/

[Ryan Beisner (1chb1n)]

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

#509 nova-compute-next for gnuoy mp238879
charm_unit_test

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

MP URL:
https://code.launchpad.net/~openstack-charmers/charms/trusty/nova-compute/0mq/+merge/238879

Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/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.509:
Starting unit tests...
......S.............................................SSSS
Name Stmts Miss Cover Missing
----------------------------------------------------
nova_compute_context 204 70 66% 34-37, 42-43, 61, 65-66, 71, 97, 101, 104, 113, 119-131, 172, 203, 227-229, 241, 256-259, 263-266, 269-272, 293, 320-328, 331-349, 357, 361, 365, 368-370, 376-385
nova_compute_hooks 141 15 89% 81, 99-100, 128, 194, 252, 257-258, 264, 270, 278, 282-285
nova_compute_utils 230 111 52% 163-219, 227, 232-235, 270-272, 279, 283-286, 294-302, 306, 315-324, 337-356, 382-383, 387-388, 407-428, 445-455, 469-470, 474, 479-480
----------------------------------------------------
TOTAL 575 196 66%
----------------------------------------------------------------------
Ran 56 tests in 2.899s

OK (SKIP=5)

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/nova-compute/0mq]

93. By Liam Young on 2014-10-23

Remove superfluous stopstart=True from 0mq config restart_on_change decorator

[Liam Young (gnuoy)]

Removed superfluous stopstart=True from 0mq config restart_on_change decorator as James suggested in inline comment

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #736 nova-compute-next for gnuoy mp238879
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.736:
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-neutron-security-groups has no default value
I: config.yaml: option migration-auth-type has no default value

Full lint output: http://paste.ubuntu.com/8638295/
Build: http://10.98.191.181:8080/job/charm_lint_check/736/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #544 nova-compute-next for gnuoy mp238879
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.544:
----------------------------------------------------------------------
Ran 56 tests in 2.752s

OK (SKIP=5)

Full unit output: http://paste.ubuntu.com/8638296/
Build: http://10.98.191.181:8080/job/charm_unit_test/544/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #289 nova-compute-next for gnuoy mp238879
    AMULET OK: believed to pass, but you should confirm results

AMULET Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.289:
juju-test.conductor DEBUG : Tearing down osci-sv04 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv04"
WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet output: http://paste.ubuntu.com/8638517/
Build: http://10.98.191.181:8080/job/charm_amulet_test/289/

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

94. By James Page on 2014-12-15

Rebase on next

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

charm_lint_check #165 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #199 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #179 nova-compute-next for gnuoy mp238879
    AMULET FAIL: amulet-test failed

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

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

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

95. By James Page on 2015-01-13

Rebase on next

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

charm_lint_check #709 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #738 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #894 nova-compute-next for gnuoy mp238879
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/894/

[Ryan Beisner (1chb1n)]

T-J & U-J deploy tests fail with:

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

2015-01-13 11:41:57 [DEBUG] deployer.import: Waiting for units before adding relations
2015-01-13 11:42:01 [DEBUG] deployer.env: Delta unit: glance/0 change:error
2015-01-13 11:42:01 [ERROR] deployer.env: The following units had errors:
   unit: glance/0: machine: 6 agent-state: error details: hook failed: "install"
2015-01-13 11:42:01 [INFO] deployer.cli: Deployment stopped. run time: 310.34

2015-01-13 11:41:56 INFO juju.worker.uniter uniter.go:480 running "install" hook
2015-01-13 11:41:56 INFO worker.uniter.jujuc server.go:102 running hook tool "juju-log" ["Installing python-netifaces with options: ['--option=Dpkg::Options::=--force-confold']"]
2015-01-13 11:41:56 DEBUG worker.uniter.jujuc server.go:103 hook context id "glance/0:install:6741374157042095863"; dir "/var/lib/juju/agents/unit-glance-0/charm"
2015-01-13 11:41:56 INFO juju-log Installing python-netifaces with options: ['--option=Dpkg::Options::=--force-confold']
2015-01-13 11:41:56 INFO install Reading package lists...
2015-01-13 11:41:56 INFO install Building dependency tree...
2015-01-13 11:41:56 INFO install Reading state information...
2015-01-13 11:41:57 INFO install The following NEW packages will be installed:
2015-01-13 11:41:57 INFO install python-netifaces
2015-01-13 11:41:57 INFO install 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
2015-01-13 11:41:57 INFO install Need to get 16.7 kB of archives.
2015-01-13 11:41:57 INFO install After this operation, 77.8 kB of additional disk space will be used.
2015-01-13 11:41:57 INFO install WARNING: The following packages cannot be authenticated!
2015-01-13 11:41:57 INFO install python-netifaces
2015-01-13 11:41:57 INFO install E: There are problems and -y was used without --force-yes
2015-01-13 11:41:57 INFO install Traceback (most recent call last):
2015-01-13 11:41:57 INFO install File "/var/lib/juju/agents/unit-glance-0/charm/hooks/install", line 8, in <module>
2015-01-13 11:41:57 INFO install from glance_utils import (
2015-01-13 11:41:57 INFO install File "/var/lib/juju/agents/unit-glance-0/charm/hooks/glance_utils.py", line 6, in <module>
2015-01-13 11:41:57 INFO install import glance_contexts
2015-01-13 11:41:57 INFO install File "/var/lib/juju/agents/unit-glance-0/charm/hooks/glance_contexts.py", line 8, in <module>
2015-01-13 11:41:57 INFO install from charmhelpers.contrib.openstack.context import (
2015-01-13 11:41:57 INFO install File "/var/lib/juju/agents/unit-glance-0/charm/hooks/charmhelpers/contrib/openstack/context.py", line 48, in <module>
2015-01-13 11:41:57 INFO install from charmhelpers.contrib.openstack.neutron import (
2015-01-13 11:41:57 INFO install File "/var/lib/juju/agents/unit-glance-0/charm/hooks/charmhelpers/contrib/openstack/neutron.py", line 11, in <module>
2015-01-13 11:41:57 INFO install from charmhelpers.contrib.openstack.utils import os_release
2015-01-13 11:41:57 INFO install File "/var/lib/juju/agents/unit-glance-0/charm/hooks/charmhelpers/contrib/openstack/utils.py", line 31, in <module>
2015-01-13 11:41:57 I...

review: Needs Fixing

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

96. By James Page on 2015-01-19

Resync 0mq helpers, use centralized template

97. By James Page on 2015-01-19

Drop parts from zeromq snippet use

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

charm_lint_check #841 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #870 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #1065 nova-compute-next for gnuoy mp238879
    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/9783669/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1065/

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

98. By James Page on 2015-01-20

Resync helper

99. By James Page on 2015-01-20

Resync helper

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

charm_lint_check #869 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #898 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #1093 nova-compute-next for gnuoy mp238879
    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/9793840/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1093/

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

charm_lint_check #875 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #904 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #1099 nova-compute-next for gnuoy mp238879
    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/9794050/
Build: http://10.245.162.77:8080/job/charm_amulet_test/1099/

[Ryan Beisner (1chb1n)]

FYI, icehouse deploy tests fail with:
(juno passes)

13:06:05 2015-01-20 13:06:05 [ERROR] deployer.env: The following units had errors:
13:06:05 unit: nova-compute/1: machine: 15 agent-state: error details: hook failed: "config-changed"

2015-01-20 13:06:02 INFO juju-log Rendering from template: nova.conf
2015-01-20 13:06:02 INFO config-changed Traceback (most recent call last):
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/config-changed", line 346, in <module>
2015-01-20 13:06:02 INFO config-changed main()
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/config-changed", line 340, in main
2015-01-20 13:06:02 INFO config-changed hooks.execute(sys.argv)
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/charmhelpers/core/hookenv.py", line 528, in execute
2015-01-20 13:06:02 INFO config-changed self._hooks[hook_name]()
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/charmhelpers/core/host.py", line 296, in wrapped_f
2015-01-20 13:06:02 INFO config-changed f(*args)
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/config-changed", line 125, in config_changed
2015-01-20 13:06:02 INFO config-changed CONFIGS.write_all()
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 261, in write_all
2015-01-20 13:06:02 INFO config-changed [self.write(k) for k in six.iterkeys(self.templates)]
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 250, in write
2015-01-20 13:06:02 INFO config-changed _out = self.render(config_file)
2015-01-20 13:06:02 INFO config-changed File "/var/lib/juju/agents/unit-nova-compute-1/charm/hooks/charmhelpers/contrib/openstack/templating.py", line 240, in render
2015-01-20 13:06:02 INFO config-changed return template.render(ctxt)
2015-01-20 13:06:02 INFO config-changed File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 969, in render
2015-01-20 13:06:02 INFO config-changed return self.environment.handle_exception(exc_info, True)
2015-01-20 13:06:02 INFO config-changed File "/usr/lib/python2.7/dist-packages/jinja2/environment.py", line 742, in handle_exception
2015-01-20 13:06:02 INFO config-changed reraise(exc_type, exc_value, tb)
2015-01-20 13:06:02 INFO config-changed File "templates/icehouse/nova.conf", line 29, in top-level template code
2015-01-20 13:06:02 INFO config-changed {% include "parts/zeromq" %}
2015-01-20 13:06:02 INFO config-changed jinja2.exceptions.TemplateNotFound: parts/zeromq
2015-01-20 13:06:02 ERROR juju.worker.uniter uniter.go:486 hook failed: exit status 1

review: Needs Fixing

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

100. By James Page on 2015-02-24

Rebase

101. By James Page on 2015-02-24

Drop icehouse specific config files - juno upwards only

102. By James Page on 2015-02-24

Add zeromq snippet for kilo

103. By James Page on 2015-02-24

Switch to trunk of charm-helpers

104. By James Page on 2015-02-24

Specialized zeromq snippet for kilo

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

charm_lint_check #2213 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #2002 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #2159 nova-compute-next for gnuoy mp238879
    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/10396600/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2159/

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

105. By James Page on 2015-03-16

Fixup pydev

106. By James Page on 2015-03-16

Rebase

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

charm_lint_check #2683 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #2474 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #2512 nova-compute-next for gnuoy mp238879
    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/10610210/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2512/

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

107. By James Page on 2015-03-16

Make 0mq support >= kilo

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

charm_lint_check #2693 nova-compute-next for gnuoy mp238879
    LINT OK: passed

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

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

charm_unit_test #2484 nova-compute-next for gnuoy mp238879
    UNIT OK: passed

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

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

charm_amulet_test #2522 nova-compute-next for gnuoy mp238879
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/2522/

[lp:~openstack-charmers/charms/trusty/nova-compute/0mq]

108. By James Page on 2015-03-31

Rebase, resync

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-31 11:43:21 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-31 15:02:03 +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 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-03-31 11:43:21 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-03-31 15:02:03 +0000
@@ -47,6 +47,7 @@
 )
 
 from charmhelpers.core.sysctl import create as sysctl_create
+from charmhelpers.core.strutils import bool_from_string
 
 from charmhelpers.core.host import (
     list_nics,
@@ -67,6 +68,7 @@
 )
 from charmhelpers.contrib.openstack.neutron import (
     neutron_plugin_attribute,
+    parse_data_port_mappings,
 )
 from charmhelpers.contrib.openstack.ip import (
     resolve_address,
@@ -82,7 +84,6 @@
     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']
 
@@ -1162,3 +1163,145 @@
             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 {}

=== 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-03-31 15:02:03 +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-03-31 15:02:03 +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-03 02:32:43 +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-31 11:43:21 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-03-31 15:02:03 +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-19 04:35:23 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-03-31 15:02:03 +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/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-03-31 11:43:21 +0000
+++ hooks/nova_compute_hooks.py	2015-03-31 15:02:03 +0000
@@ -30,6 +30,7 @@
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     openstack_upgrade_available,
+    os_requires_version,
 )
 
 from charmhelpers.contrib.storage.linux.ceph import (
@@ -57,6 +58,7 @@
     ceph_config_file, CEPH_SECRET,
     enable_shell, disable_shell,
     fix_path_ownership,
+    get_topics,
     assert_charm_supports_ipv6,
     manage_ovs,
 )
@@ -118,6 +120,8 @@
         fix_path_ownership(fp, user='nova')
 
     [compute_joined(rid) for rid in relation_ids('cloud-compute')]
+    for rid in relation_ids('zeromq-configuration'):
+        zeromq_configuration_relation_joined(rid)
 
     update_nrpe_config()
 
@@ -316,6 +320,20 @@
     CONFIGS.write_all()
 
 
[e-mail]('zeromq-configuration-relation-joined')
+@os_requires_version('kilo', 'nova-common')
+def zeromq_configuration_relation_joined(relid=None):
+    relation_set(relation_id=relid,
+                 topics=" ".join(get_topics()),
+                 users="nova")
+
+
[e-mail]('zeromq-configuration-relation-changed')
+@restart_on_change(restart_map())
+def zeromq_configuration_relation_changed():
+    CONFIGS.write(NOVA_CONF)
+
+
 @hooks.hook('nrpe-external-master-relation-joined',
             'nrpe-external-master-relation-changed')
 def update_nrpe_config():

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-03-31 13:22:53 +0000
+++ hooks/nova_compute_utils.py	2015-03-31 15:02:03 +0000
@@ -101,6 +101,8 @@
                          service='nova',
                          config_file=NOVA_CONF),
                      InstanceConsoleContext(),
+                     context.ZeroMQContext(),
+                     context.NotificationDriverContext(),
                      MetadataServiceContext(),
                      HostIPContext()],
     },
@@ -496,6 +498,10 @@
     check_call(cmd)
 
 
+def get_topics():
+    return ['compute']
+
+
 def assert_charm_supports_ipv6():
     """Check whether we are able to support charms ipv6."""
     if lsb_release()['DISTRIB_CODENAME'].lower() < "trusty":

=== added symlink 'hooks/zeromq-configuration-relation-changed'
=== target is u'nova_compute_hooks.py'
=== added symlink 'hooks/zeromq-configuration-relation-joined'
=== target is u'nova_compute_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-01-09 15:40:23 +0000
+++ metadata.yaml	2015-03-31 15:02:03 +0000
@@ -30,6 +30,6 @@
   neutron-plugin:
     interface: neutron-plugin
     scope: container
-peers:
-  compute-peer:
-    interface: nova
+  zeromq-configuration:
+    interface: zeromq-configuration
+    scope: container

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-03-31 11:43:21 +0000
+++ templates/kilo/nova.conf	2015-03-31 15:02:03 +0000
@@ -101,6 +101,8 @@
 {% endfor -%}
 {% endif -%}
 
+{% include "section-zeromq" %}
+
 {% if network_manager == 'neutron' and network_manager_config -%}
 [neutron]
 url = {{ network_manager_config.neutron_url }}

=== modified file 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-09 13:21:38 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-31 15:02:03 +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_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-03-31 11:43:21 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-03-31 15:02:03 +0000
@@ -85,6 +85,7 @@
     @patch.object(hooks, 'compute_joined')
     def test_config_changed_with_migration(self, compute_joined):
         self.migration_enabled.return_value = True
+        _zmq_joined = self.patch('zeromq_configuration_relation_joined')
         self.test_config.set('migration-auth-type', 'ssh')
         self.relation_ids.return_value = [
             'cloud-compute:0',
@@ -97,10 +98,12 @@
         ]
         self.assertEquals(ex, compute_joined.call_args_list)
         self.assertTrue(self.initialize_ssh_keys.called)
+        self.assertTrue(_zmq_joined.called)
 
     @patch.object(hooks, 'compute_joined')
     def test_config_changed_with_resize(self, compute_joined):
         self.test_config.set('enable-resize', True)
+        _zmq_joined = self.patch('zeromq_configuration_relation_joined')
         self.relation_ids.return_value = [
             'cloud-compute:0',
             'cloud-compute:1'
@@ -113,10 +116,12 @@
         self.assertEquals(ex, compute_joined.call_args_list)
         self.initialize_ssh_keys.assert_called_with(user='nova')
         self.enable_shell.assert_called_with(user='nova')
+        self.assertTrue(_zmq_joined.called)
 
     @patch.object(hooks, 'compute_joined')
     def test_config_changed_without_resize(self, compute_joined):
         self.test_config.set('enable-resize', False)
+        _zmq_joined = self.patch('zeromq_configuration_relation_joined')
         self.relation_ids.return_value = [
             'cloud-compute:0',
             'cloud-compute:1'
@@ -128,6 +133,7 @@
         ]
         self.assertEquals(ex, compute_joined.call_args_list)
         self.disable_shell.assert_called_with(user='nova')
+        self.assertTrue(_zmq_joined.called)
 
     @patch.object(hooks, 'compute_joined')
     def test_config_changed_no_upgrade_no_migration(self, compute_joined):