Juju Charms Collection
neutron-gateway package

Merge lp:~gabriel-samfira/charms/trusty/neutron-gateway/next into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

  1. Trusty Tahr (14.04)
  2. next
  3. Merge into next
Proposed by Gabriel Samfira
Status: Merged
Merged at revision: 138
Proposed branch: lp:~gabriel-samfira/charms/trusty/neutron-gateway/next
Merge into: lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next
Diff against target: 38 lines (+3/-3)
3 files modified
templates/icehouse/ml2_conf.ini (+1/-1)
templates/juno/ml2_conf.ini (+1/-1)
tests/basic_deployment.py (+1/-1)
To merge this branch: bzr merge lp:~gabriel-samfira/charms/trusty/neutron-gateway/next
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+270039@code.launchpad.net

Description of the change

This adds the decomposed Hyper-V mechanism driver to the ml2_conf.ini. This change depends on:

https://code.launchpad.net/~gabriel-samfira/charms/trusty/neutron-api/next/+merge/270036

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #8619 neutron-gateway-next for gabriel-samfira mp270039
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9323 neutron-gateway-next for gabriel-samfira mp270039
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6235 neutron-gateway-next for gabriel-samfira mp270039
    AMULET FAIL: amulet-test failed

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

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

lp:~gabriel-samfira/charms/trusty/neutron-gateway/next updated
138. By Gabriel Samfira

fixed amulet test

this PR adds hyperv mechanism driver back into the charm

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9936 neutron-gateway-next for gabriel-samfira mp270039
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9155 neutron-gateway-next for gabriel-samfira mp270039
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6420 neutron-gateway-next for gabriel-samfira mp270039
    AMULET FAIL: amulet-test failed

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

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

lp:~gabriel-samfira/charms/trusty/neutron-gateway/next updated
139. By Gabriel Samfira

add hyperv to icehouse ml2_config.ini

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #9937 neutron-gateway-next for gabriel-samfira mp270039
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #9156 neutron-gateway-next for gabriel-samfira mp270039
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #6421 neutron-gateway-next for gabriel-samfira mp270039
    AMULET FAIL: amulet-test failed

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

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

Revision history for this message
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/icehouse/ml2_conf.ini'
2--- templates/icehouse/ml2_conf.ini 2015-03-03 06:24:07 +0000
3+++ templates/icehouse/ml2_conf.ini 2015-09-14 15:08:07 +0000
4@@ -5,7 +5,7 @@
5 [ml2]
6 type_drivers = gre,vxlan,vlan,flat
7 tenant_network_types = gre,vxlan,vlan,flat
8-mechanism_drivers = openvswitch,l2population
9+mechanism_drivers = openvswitch,hyperv,l2population
10
11 [ml2_type_gre]
12 tunnel_id_ranges = 1:1000
13
14=== modified file 'templates/juno/ml2_conf.ini'
15--- templates/juno/ml2_conf.ini 2015-03-26 10:49:09 +0000
16+++ templates/juno/ml2_conf.ini 2015-09-14 15:08:07 +0000
17@@ -5,7 +5,7 @@
18 [ml2]
19 type_drivers = gre,vxlan,vlan,flat
20 tenant_network_types = gre,vxlan,vlan,flat
21-mechanism_drivers = openvswitch,l2population
22+mechanism_drivers = openvswitch,hyperv,l2population
23
24 [ml2_type_gre]
25 tunnel_id_ranges = 1:1000
26
27=== modified file 'tests/basic_deployment.py'
28--- tests/basic_deployment.py 2015-07-29 17:23:10 +0000
29+++ tests/basic_deployment.py 2015-09-14 15:08:07 +0000
30@@ -399,7 +399,7 @@
31 'ml2': {
32 'type_drivers': 'gre,vxlan,vlan,flat',
33 'tenant_network_types': 'gre,vxlan,vlan,flat',
34- 'mechanism_drivers': 'openvswitch,l2population'
35+ 'mechanism_drivers': 'openvswitch,hyperv,l2population'
36 },
37 'ml2_type_gre': {
38 'tunnel_id_ranges': '1:1000'

Subscribers

People subscribed via source and target branches