Merge lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Edward Hope-Morley]

[James Page (james-page)]

review: Needs Fixing

[Edward Hope-Morley (hopem)]

Hey James, this was merged a while back into lp:charm-helpers and lp:~openstack-charmers/charm-helpers/stable (revision 114) and since this MP has been around for a while it also looks like the charm-helpers sync was done (by you) in revision 63 of this charm. So all that is left is this bit.

[James Page (james-page)]

I think we cut our losses and just provide this for >= icehouse - please drop the folsom template updates and the associated _utils bits.

review: Needs Fixing

[Edward Hope-Morley (hopem)]

@jamespage fixed.

[Ryan Beisner (1chb1n)]

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

#451 nova-cloud-controller-next for hopem mp237963
charm_unit_test

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

MP URL:
https://code.launchpad.net/~hopem/charms/trusty/nova-cloud-controller/next.lp1273022/+merge/237963

Proposed branch:
lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022

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.451:
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 145 104 28% 21-28, 39-41, 47-61, 68-86, 98-151, 162-177, 185-186, 190, 194-196, 201, 204-218, 224-238, 256-261, 266-269, 274-276
hooks/nova_cc_hooks 424 151 64% 131-134, 147-148, 172, 182-190, 221, 226-231, 242, 319-322, 330-333, 339-342, 352-368, 377-379, 389-403, 407-416, 502, 512, 516-517, 570, 576-586, 591-602, 612-622, 627-666, 676-691, 699-703, 716, 726-735, 759, 764-772, 820-823
hooks/nova_cc_utils 442 111 75% 292-297, 308-311, 321-322, 378, 380, 424-426, 430, 444-452, 459-464, 468-482, 588-590, 595-598, 603, 607, 631-632, 646-648, 669-670, 676-699, 703-709, 713-719, 725, 731, 738, 749-753, 838, 898-904, 908-910, 914-917, 921-933
-----------------------------------------------------
TOTAL 1011 366 64%
----------------------------------------------------------------------
Ran 90 tests in 9.788s

OK

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

[Ryan Beisner (1chb1n)]

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

#645 nova-cloud-controller-next for hopem mp237963
charm_lint_check

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

MP URL:
https://code.launchpad.net/~hopem/charms/trusty/nova-cloud-controller/next.lp1273022/+merge/237963

Proposed branch:
lp:~hopem/charms/trusty/nova-cloud-controller/next.lp1273022

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.645:
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
W: config.yaml: option neutron-alchemy-flags does not have the keys: default
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/

[James Page (james-page)]

review: Needs Fixing

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #732 nova-cloud-controller-next for hopem mp239311
    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.732:
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/8632485/
Build: http://10.98.191.181:8080/job/charm_lint_check/732/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #540 nova-cloud-controller-next for hopem mp239311
    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.540:
----------------------------------------------------------------------
Ran 97 tests in 8.846s

OK

Full unit output: http://paste.ubuntu.com/8632486/
Build: http://10.98.191.181:8080/job/charm_unit_test/540/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #285 nova-cloud-controller-next for hopem mp239311
    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.285:
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/8632647/
Build: http://10.98.191.181:8080/job/charm_amulet_test/285/

=== modified file 'config.yaml'
--- config.yaml	2014-10-07 11:37:20 +0000
+++ config.yaml	2014-10-22 21:09:45 +0000
@@ -139,6 +139,12 @@
     type: string
     default:
     description: SSL key to use with certificate specified as ssl_cert.
+  neutron-alchemy-flags:
+    type: string
+    default:
+    description: |
+      Comma separated list of key=value sqlalchemy related config flags to be
+      set in plugin ini file.
   ssl_ca:
     type: string
     default:

=== modified file 'revision'
--- revision	2014-04-25 16:46:42 +0000
+++ revision	2014-10-22 21:09:45 +0000
@@ -1,1 +1,1 @@
-500
+501

=== modified file 'templates/parts/section-database'
--- templates/parts/section-database	2014-05-02 09:21:30 +0000
+++ templates/parts/section-database	2014-10-22 21:09:45 +0000
@@ -1,4 +1,9 @@
 {% if database_host -%}
 [database]
 connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
+{% if neutron_alchemy_flags -%}
+{% for key, value in neutron_alchemy_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 {% endif -%}