Juju Charms Collection
nova-cloud-controller package

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

  1. Trusty Tahr (14.04)
  2. next
  3. Merge into next
Proposed by Bilal Baqar on 2015-09-02
Status: Merged
Merged at revision: 185
Proposed branch: lp:~bbaqar/charms/trusty/nova-cloud-controller/next
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 47 lines (+15/-0)
3 files modified
templates/icehouse/nova.conf (+5/-0)
templates/juno/nova.conf (+5/-0)
templates/kilo/nova.conf (+5/-0)
To merge this branch: bzr merge lp:~bbaqar/charms/trusty/nova-cloud-controller/next
Reviewer Review Type Date Requested Status
OpenStack Charmers 2015-09-02 Pending
Review via email: mp+269897@code.launchpad.net

Description of the Change

Resubmitting changes for PLUMgrid neutron plugin into the next branch.

To post a comment you must log in.
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9231 nova-cloud-controller-next for bbaqar mp269897
    LINT OK: passed

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8533 nova-cloud-controller-next for bbaqar mp269897
    UNIT OK: passed

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9236 nova-cloud-controller-next for bbaqar mp269897
    LINT OK: passed

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8537 nova-cloud-controller-next for bbaqar mp269897
    UNIT OK: passed

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6194 nova-cloud-controller-next for bbaqar mp269897
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

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

uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6197 nova-cloud-controller-next for bbaqar mp269897
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
Timeout occurred (2700s), printing juju status...environment: osci-sv08
ERROR:root:Make target returned non-zero.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/icehouse/nova.conf'
2--- templates/icehouse/nova.conf 2015-07-24 12:29:29 +0000
3+++ templates/icehouse/nova.conf 2015-09-02 11:31:16 +0000
4@@ -89,6 +89,11 @@
5 nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
6 {% endif -%}
7
8+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
9+security_group_api=neutron
10+firewall_driver = nova.virt.firewall.NoopFirewallDriver
11+{% endif -%}
12+
13 {% if network_manager_config -%}
14 {% for key, value in network_manager_config.iteritems() -%}
15 {{ key }} = {{ value }}
16
17=== modified file 'templates/juno/nova.conf'
18--- templates/juno/nova.conf 2015-07-24 12:29:29 +0000
19+++ templates/juno/nova.conf 2015-09-02 11:31:16 +0000
20@@ -84,6 +84,11 @@
21 {% endif -%}
22 {% endif -%}
23
24+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
25+security_group_api=neutron
26+firewall_driver = nova.virt.firewall.NoopFirewallDriver
27+{% endif -%}
28+
29 {% if network_manager_config -%}
30 {% for key, value in network_manager_config.iteritems() -%}
31 {{ key }} = {{ value }}
32
33=== modified file 'templates/kilo/nova.conf'
34--- templates/kilo/nova.conf 2015-07-24 12:29:29 +0000
35+++ templates/kilo/nova.conf 2015-09-02 11:31:16 +0000
36@@ -82,6 +82,11 @@
37 nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
38 {% endif -%}
39
40+{% if neutron_plugin and neutron_plugin == 'plumgrid' -%}
41+security_group_api=neutron
42+firewall_driver = nova.virt.firewall.NoopFirewallDriver
43+{% endif -%}
44+
45 {% if network_manager_config -%}
46 {% for key, value in network_manager_config.iteritems() -%}
47 {{ key }} = {{ value }}

Subscribers

People subscribed via source and target branches