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

#694 nova-cloud-controller-next for gnuoy mp238878
charm_lint_check

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

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

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

Results summary:
    LINT FAIL: lint-check failed

LINT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.694:
hooks/nova_cc_hooks.py:64:1: F811 redefinition of unused 'services' from line 64
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.

#500 nova-cloud-controller-next for gnuoy mp238878
charm_unit_test

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

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

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

Results summary:
    UNIT FAIL: unit-test failed

UNIT Results (max last 25 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.500:
    return func(*args, **keywargs)
  File "/var/lib/jenkins/checkout/nova-cloud-controller/unit_tests/test_nova_cc_hooks.py", line 117, in test_config_changed_with_upgrade
    hooks.config_changed()
  File "hooks/nova_cc_utils.py", line 896, in wrapped_f
    f(*args)
  File "hooks/charmhelpers/core/host.py", line 269, in wrapped_f
    f(*args)
  File "hooks/nova_cc_hooks.py", line 172, in config_changed
    zeromq_configuration_relation_joined(rid)
  File "hooks/charmhelpers/contrib/openstack/utils.py", line 507, in wrapped_f
    " before %s" % ostack_release)
Exception: This hook is not supported on releases before juno

Name Stmts Miss Cover Missing
-----------------------------------------------------
hooks/nova_cc_context 151 109 28% 21-28, 39-41, 48-59, 65-79, 86-104, 116-169, 180-195, 203-204, 208, 212-214, 219, 222-236, 242-256, 273-276, 281-283
hooks/nova_cc_hooks 453 147 68% 135-138, 151-152, 178, 189-190, 194, 229, 234-239, 250, 330-333, 341-344, 350-353, 363-379, 388-390, 400-414, 418-427, 513, 523, 527-528, 581, 587-597, 602-613, 623-633, 638-677, 687-702, 710-714, 739-748, 772, 777-785, 811, 863, 871, 875-878
hooks/nova_cc_utils 447 115 74% 296-301, 312-315, 325-326, 382, 384, 428-430, 434, 448-456, 463-468, 472-486, 592-594, 599-602, 607, 611, 635-636, 650-652, 673-674, 680-703, 707-713, 717-723, 729, 735, 742, 753-757, 842, 902-905, 909-915, 919-921, 925-928, 932-944
-----------------------------------------------------
TOTAL 1051 371 65%
----------------------------------------------------------------------
Ran 97 tests in 10.713s

FAILED (errors=1)
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-cloud-controller/0mq]

108. 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.

#702 nova-cloud-controller-next for gnuoy mp238878
charm_lint_check

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

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

Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-cloud-controller/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.702:
I: relation cloud-controller has no hooks
I: config.yaml: option ssl_key has no default value
I: config.yaml: option nvp-tz-uuid has no default value
I: config.yaml: option vip has no default value
I: config.yaml: option nvp-controllers has no default value
I: config.yaml: option console-access-protocol has no default value
I: config.yaml: option ssl_ca has no default value
I: config.yaml: option os-public-network has no default value
I: config.yaml: option haproxy-server-timeout has no default value
I: config.yaml: option os-admin-network has no default value
I: config.yaml: option haproxy-client-timeout has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-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/

[Ryan Beisner (1chb1n)]

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

#508 nova-cloud-controller-next for gnuoy mp238878
charm_unit_test

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

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

Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-cloud-controller/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.508:
Ensure services with incomplete interfaces are stopped ... ok
Ensure services with complete interfaces are not stopped ... ok
Ensure that if disabled, service guards nothing ... ok
test_ssh_authorized_key_doesnt_exist (unit_tests.test_nova_cc_utils.NovaCCUtilsTests) ... ok
test_ssh_authorized_key_exists (unit_tests.test_nova_cc_utils.NovaCCUtilsTests) ... ok
test_ssh_compute_remove (unit_tests.test_nova_cc_utils.NovaCCUtilsTests) ... ok
test_ssh_directory_for_unit (unit_tests.test_nova_cc_utils.NovaCCUtilsTests) ... ok
test_ssh_known_host_key (unit_tests.test_nova_cc_utils.NovaCCUtilsTests) ... ok
Simulate a call to do_openstack_upgrade() for grizzly->icehouse ... ok
Verify get_step_upgrade_source() for grizzly->icehouse ... ok
Simulate a call to do_openstack_upgrade() for havana->icehouse ... ok
Simulate a call to do_openstack_upgrade() for havana->icehouse api ... ok
Verify get_step_upgrade_source() for havana->icehouse ... ok

Name Stmts Miss Cover Missing
-----------------------------------------------------
hooks/nova_cc_context 151 109 28% 21-28, 39-41, 48-59, 65-79, 86-104, 116-169, 180-195, 203-204, 208, 212-214, 219, 222-236, 242-256, 273-276, 281-283
hooks/nova_cc_hooks 453 147 68% 134-137, 150-151, 177, 188-189, 193, 228, 233-238, 249, 329-332, 340-343, 349-352, 362-378, 387-389, 399-413, 417-426, 512, 522, 526-527, 580, 586-596, 601-612, 622-632, 637-676, 686-701, 709-713, 738-747, 771, 776-784, 810, 862, 870, 874-877
hooks/nova_cc_utils 447 115 74% 296-301, 312-315, 325-326, 382, 384, 428-430, 434, 448-456, 463-468, 472-486, 592-594, 599-602, 607, 611, 635-636, 650-652, 673-674, 680-703, 707-713, 717-723, 729, 735, 742, 753-757, 842, 902-905, 909-915, 919-921, 925-928, 932-944
-----------------------------------------------------
TOTAL 1051 371 65%
----------------------------------------------------------------------
Ran 97 tests in 8.907s

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/

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

109. By James Page on 2014-10-21

Rebase on target

[Ryan Beisner (1chb1n)]

UOSCI bot says: This MP triggered a test on the Ubuntu OSCI system.

charm_lint_check #166 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: believed to pass, but you should confirm results

Build: http://10.98.191.152:8080/job/charm_lint_check/166/
MP: https://code.launchpad.net/~openstack-charmers/charms/trusty/nova-cloud-controller/0mq/+merge/238878
Proposed: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/0mq

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.166:
I: config.yaml: option haproxy-client-timeout has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-network has no default value
Full lint result: http://paste.ubuntu.com/8616250/

[Ryan Beisner (1chb1n)]

UOSCI bot says: This MP triggered a test on the Ubuntu OSCI system.

charm_unit_test #101 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: believed to pass, but you should confirm results

Build: http://10.98.191.152:8080/job/charm_unit_test/101/
MP: https://code.launchpad.net/~openstack-charmers/charms/trusty/nova-cloud-controller/0mq/+merge/238878
Proposed: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/0mq

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

OK
Full unit result: http://paste.ubuntu.com/8616251/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #725 nova-cloud-controller-next for gnuoy mp238878
    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.725:
I: config.yaml: option haproxy-client-timeout has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-network has no default value

Full lint output: http://paste.ubuntu.com/8616276/
Build: http://10.98.191.181:8080/job/charm_lint_check/725/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #531 nova-cloud-controller-next for gnuoy mp238878
    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.531:
----------------------------------------------------------------------
Ran 97 tests in 9.073s

OK

Full unit output: http://paste.ubuntu.com/8616278/
Build: http://10.98.191.181:8080/job/charm_unit_test/531/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #279 nova-cloud-controller-next for gnuoy mp238878
    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.279:
juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet output: http://paste.ubuntu.com/8616479/
Build: http://10.98.191.181:8080/job/charm_amulet_test/279/

[James Page (james-page)]

review: Needs Fixing

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

110. By James Page on 2014-12-15

Rebase on next

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

charm_lint_check #164 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #198 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #178 nova-cloud-controller-next for gnuoy mp238878
    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/9527390/
Build: http://10.245.162.77:8080/job/charm_amulet_test/178/

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

111. By James Page on 2015-01-13

Rebase on next

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

charm_unit_test #737 nova-cloud-controller-next for gnuoy mp238878
    UNIT FAIL: unit-test failed

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

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

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

charm_lint_check #708 nova-cloud-controller-next for gnuoy mp238878
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
  hooks/nova_cc_hooks.py:862:1: E302 expected 2 blank lines, found 0
  make: *** [lint] Error 1

Full lint test output: http://paste.ubuntu.com/9727336/
Build: http://10.245.162.77:8080/job/charm_lint_check/708/

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

charm_amulet_test #893 nova-cloud-controller-next for gnuoy mp238878
    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/9727373/
Build: http://10.245.162.77:8080/job/charm_amulet_test/893/

[Ryan Beisner (1chb1n)]

FYI, more info from juju unit log re: n-c-c install hook fail:

2015-01-13 09:41:49 INFO juju.worker.uniter modes.go:65 found queued "install" hook
2015-01-13 09:41:49 INFO juju.worker.uniter uniter.go:480 running "install" hook
2015-01-13 09:41:49 INFO install File "/var/lib/juju/agents/unit-nova-cloud-controller-0/charm/hooks/install", line 861
2015-01-13 09:41:49 INFO install <<<<<<< TREE
2015-01-13 09:41:49 INFO install ^
2015-01-13 09:41:49 INFO install SyntaxError: invalid syntax
2015-01-13 09:41:49 ERROR juju.worker.uniter uniter.go:486 hook failed: exit status 1

review: Needs Fixing

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

112. By James Page on 2015-01-16

Fixup merge problem

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

charm_lint_check #793 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #822 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #978 nova-cloud-controller-next for gnuoy mp238878
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

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

review: Needs Fixing

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

113. By James Page on 2015-01-19

Use centralized zeromq template

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

charm_lint_check #840 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #869 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #1064 nova-cloud-controller-next for gnuoy mp238878
    AMULET OK: passed

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

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

114. By James Page on 2015-01-19

Fixup zeromq sections

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

charm_lint_check #845 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #874 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #1069 nova-cloud-controller-next for gnuoy mp238878
    AMULET OK: passed

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

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

115. By James Page on 2015-01-20

Resync helper

116. By James Page on 2015-01-20

Resync helper

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

charm_lint_check #868 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #897 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #1092 nova-cloud-controller-next for gnuoy mp238878
    AMULET OK: passed

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

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

charm_lint_check #874 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #903 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #1098 nova-cloud-controller-next for gnuoy mp238878
    AMULET OK: passed

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

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

117. By James Page on 2015-02-24

Rebase and resync

118. By James Page on 2015-02-24

Add zeromq support for kilo

119. By James Page on 2015-02-24

Use nova package for os check

120. By James Page on 2015-02-24

Drop zeromq support in icehouse

121. By James Page on 2015-02-24

Mark juno template as juno

122. By James Page on 2015-02-24

Move zeromq section to correct part of file

123. By James Page on 2015-02-24

Specialized zeromq snippet for kilo

124. By James Page on 2015-02-24

Reorder zeromq inclusion

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

charm_lint_check #2202 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #1991 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #2148 nova-cloud-controller-next for gnuoy mp238878
    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/10396215/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2148/

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

125. By James Page on 2015-03-16

Rebase

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

charm_lint_check #2682 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #2473 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #2511 nova-cloud-controller-next for gnuoy mp238878
    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/10610081/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2511/

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

126. By James Page on 2015-03-16

Make 0mq support >= kilo

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

charm_lint_check #2692 nova-cloud-controller-next for gnuoy mp238878
    LINT OK: passed

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

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

charm_unit_test #2483 nova-cloud-controller-next for gnuoy mp238878
    UNIT OK: passed

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

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

charm_amulet_test #2521 nova-cloud-controller-next for gnuoy mp238878
    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/10610793/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2521/

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

127. By James Page on 2015-03-30

Rebase, resync

128. By James Page on 2015-03-31

Rebase

[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:39:19 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-31 14:56:40 +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:39:19 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-03-31 14:56:40 +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 14:56:40 +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 14:56:40 +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-02-24 12:37:34 +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:39:19 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-03-31 14:56:40 +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:28:27 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-03-31 14:56:40 +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_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2015-03-31 11:39:19 +0000
+++ hooks/nova_cc_hooks.py	2015-03-31 14:56:40 +0000
@@ -46,6 +46,7 @@
     configure_installation_source,
     openstack_upgrade_available,
     os_release,
+    os_requires_version,
     sync_db_with_multi_ipv6_addresses
 )
 
@@ -79,6 +80,7 @@
     migrate_nova_database,
     neutron_plugin,
     save_script_rc,
+    services,
     ssh_compute_add,
     ssh_compute_remove,
     ssh_known_hosts_lines,
@@ -94,8 +96,8 @@
     console_attributes,
     service_guard,
     guard_map,
-    services,
-    setup_ipv6
+    get_topics,
+    setup_ipv6,
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
@@ -172,6 +174,8 @@
             for rid in relation_ids('cloud-compute')]
     for r_id in relation_ids('identity-service'):
         identity_joined(rid=r_id)
+    for rid in relation_ids('zeromq-configuration'):
+        zeromq_configuration_relation_joined(rid)
     [cluster_joined(rid) for rid in relation_ids('cluster')]
     update_nrpe_config()
 
@@ -866,6 +870,14 @@
         quantum_joined(rid=rid)
 
 
[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")
+
+
 @hooks.hook('nrpe-external-master-relation-joined',
             'nrpe-external-master-relation-changed')
 def update_nrpe_config():
@@ -889,6 +901,12 @@
     CONFIGS.write(NOVA_CONF)
 
 
[e-mail]('zeromq-configuration-relation-changed')
+@restart_on_change(restart_map(), stopstart=True)
+def zeromq_configuration_relation_changed():
+    CONFIGS.write(NOVA_CONF)
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2015-03-31 11:39:19 +0000
+++ hooks/nova_cc_utils.py	2015-03-31 14:56:40 +0000
@@ -128,6 +128,8 @@
                          service='nova',
                          service_user='nova'),
                      nova_cc_context.VolumeServiceContext(),
+                     context.ZeroMQContext(),
+                     context.NotificationDriverContext(),
                      nova_cc_context.NovaIPv6Context(),
                      nova_cc_context.NeutronCCContext(),
                      nova_cc_context.NovaConfigContext(),
@@ -928,6 +930,13 @@
     return wrap
 
 
+def get_topics():
+    topics = ['scheduler', 'conductor']
+    if 'nova-consoleauth' in services():
+        topics.append('consoleauth')
+    return topics
+
+
 def cmd_all_services(cmd):
     if cmd == 'start':
         for svc in services():

=== added symlink 'hooks/zeromq-configuration-relation-changed'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/zeromq-configuration-relation-joined'
=== target is u'nova_cc_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2015-01-09 15:47:07 +0000
+++ metadata.yaml	2015-03-31 14:56:40 +0000
@@ -45,6 +45,9 @@
     scope: container
   memcache:
     interface: memcache
+  zeromq-configuration:
+    interface: zeromq-configuration
+    scope: container
 peers:
   cluster:
     interface: nova-ha

=== modified file 'templates/icehouse/neutron.conf'
--- templates/icehouse/neutron.conf	2015-02-20 10:21:52 +0000
+++ templates/icehouse/neutron.conf	2015-03-31 14:56:40 +0000
@@ -7,7 +7,9 @@
 lock_path = $state_path/lock
 bind_host = {{ bind_host }}
 auth_strategy = keystone
+{% if notifications == 'True' -%}
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
+{% endif -%}
 api_workers = {{ workers }}
 use_syslog = {{ use_syslog }}
 

=== added directory 'templates/juno'
=== added file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	1970-01-01 00:00:00 +0000
+++ templates/juno/nova.conf	2015-03-31 14:56:40 +0000
@@ -0,0 +1,156 @@
+# juno
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+verbose={{ verbose }}
+debug={{ debug }}
+dhcpbridge_flagfile=/etc/nova/nova.conf
+dhcpbridge=/usr/bin/nova-dhcpbridge
+logdir=/var/log/nova
+state_path=/var/lib/nova
+lock_path=/var/lock/nova
+force_dhcp_release=True
+iscsi_helper=tgtadm
+libvirt_use_virtio_for_bridges=True
+connection_type=libvirt
+root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
+ec2_private_dns_show_ip=True
+api_paste_config=/etc/nova/api-paste.ini
+volumes_path=/var/lib/nova/volumes
+enabled_apis=ec2,osapi_compute,metadata
+auth_strategy=keystone
+compute_driver=libvirt.LibvirtDriver
+use_ipv6 = {{ use_ipv6 }}
+osapi_compute_listen = {{ bind_host }}
+metadata_host = {{ bind_host }}
+s3_listen = {{ bind_host }}
+ec2_listen = {{ bind_host }}
+
+osapi_compute_workers = {{ workers }}
+ec2_workers = {{ workers }}
+
+scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
+cpu_allocation_ratio = {{ cpu_allocation_ratio }}
+ram_allocation_ratio = {{ ram_allocation_ratio }}
+
+use_syslog={{ use_syslog }}
+my_ip = {{ host_ip }}
+
+{% if memcached_servers %}
+memcached_servers = {{ memcached_servers }}
+{% endif %}
+
+{% if keystone_ec2_url -%}
+keystone_ec2_url = {{ keystone_ec2_url }}
+{% endif -%}
+
+{% include "parts/rabbitmq" %}
+
+{% if glance_api_servers -%}
+glance_api_servers = {{ glance_api_servers }}
+{% endif -%}
+
+{% if rbd_pool -%}
+rbd_pool = {{ rbd_pool }}
+rbd_user = {{ rbd_user }}
+rbd_secret_uuid = {{ rbd_secret_uuid }}
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin == 'ovs' -%}
+libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
+libvirt_user_virtio_for_bridges =  True
+{% if neutron_security_groups -%}
+security_group_api = {{ network_manager }}
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
+{% if neutron_plugin and neutron_plugin == 'nvp' -%}
+security_group_api = neutron
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
+{% if network_manager_config -%}
+{% for key, value in network_manager_config.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if network_manager and network_manager == 'quantum' -%}
+network_api_class = nova.network.quantumv2.api.API
+quantum_url = {{ neutron_url }}
+{% if auth_host -%}
+quantum_auth_strategy = keystone
+quantum_admin_tenant_name = {{ admin_tenant_name }}
+quantum_admin_username = {{ admin_user }}
+quantum_admin_password = {{ admin_password }}
+quantum_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
+{% endif -%}
+{% elif network_manager and network_manager == 'neutron' -%}
+network_api_class = nova.network.neutronv2.api.API
+neutron_url = {{ neutron_url }}
+{% if auth_host -%}
+neutron_auth_strategy = keystone
+neutron_admin_tenant_name = {{ admin_tenant_name }}
+neutron_admin_username = {{ admin_user }}
+neutron_admin_password = {{ admin_password }}
+neutron_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
+{% endif -%}
+{% else -%}
+network_manager = nova.network.manager.FlatDHCPManager
+{% endif -%}
+
+{% if default_floating_pool -%}
+default_floating_pool = {{ default_floating_pool }}
+{% endif -%}
+
+{% if volume_service -%}
+volume_api_class=nova.volume.cinder.API
+{% endif -%}
+
+{% if user_config_flags -%}
+{% for key, value in user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if listen_ports -%}
+{% for key, value in listen_ports.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if sections and 'DEFAULT' in sections -%}
+{% for key, value in sections['DEFAULT'] -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif %}
+
+{% include "parts/database-v2" %}
+
+{% if auth_host -%}
+[keystone_authtoken]
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
+auth_host = {{ auth_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+{% endif -%}
+
+[osapi_v3]
+enabled=True
+
+{% include "parts/cell" %}
+
+[conductor]
+workers = {{ workers }}

=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-03-31 11:39:19 +0000
+++ templates/kilo/nova.conf	2015-03-31 14:56:40 +0000
@@ -114,6 +114,8 @@
 {% endfor -%}
 {% endif %}
 
+{% include "section-zeromq" %}
+
 {% include "parts/database-v2" %}
 
 {% if glance_api_servers -%}

=== added file 'templates/kilo/zeromq'
--- templates/kilo/zeromq	1970-01-01 00:00:00 +0000
+++ templates/kilo/zeromq	2015-03-31 14:56:40 +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 = 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 'tests/charmhelpers/contrib/openstack/amulet/deployment.py'
--- tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-31 11:39:19 +0000
+++ tests/charmhelpers/contrib/openstack/amulet/deployment.py	2015-03-31 14:56:40 +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_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2015-03-31 11:39:19 +0000
+++ unit_tests/test_nova_cc_hooks.py	2015-03-31 14:56:40 +0000
@@ -120,10 +120,12 @@
                                          identity_joined, cluster_joined):
         self.openstack_upgrade_available.return_value = True
         self.relation_ids.return_value = ['generic_rid']
+        _zmq_joined = self.patch('zeromq_configuration_relation_joined')
         hooks.config_changed()
         self.assertTrue(self.do_openstack_upgrade.called)
         self.assertTrue(neutron_api_joined.called)
         self.assertTrue(identity_joined.called)
+        self.assertTrue(_zmq_joined.called)
         self.assertTrue(cluster_joined.called)
         self.assertTrue(self.save_script_rc.called)