Merge lp://staging/~seyeongkim/charms/trusty/neutron-api/lp1386911 into lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by Seyeong Kim
Status: Merged
Merged at revision: 83
Proposed branch: lp://staging/~seyeongkim/charms/trusty/neutron-api/lp1386911
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/neutron-api/next
Diff against target: 189 lines (+126/-0)
5 files modified
config.yaml (+65/-0)
hooks/neutron_api_context.py (+13/-0)
templates/icehouse/neutron.conf (+13/-0)
templates/kilo/neutron.conf (+13/-0)
unit_tests/test_neutron_api_context.py (+22/-0)
To merge this branch: bzr merge lp://staging/~seyeongkim/charms/trusty/neutron-api/lp1386911
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
OpenStack Charmers Pending
Review via email: mp+249468@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-02-04.

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

charm_lint_check #1559 neutron-api-next for xtrusia mp248474
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #1514 neutron-api-next for xtrusia mp248474
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #1637 neutron-api-next for xtrusia mp248474
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

Revision history for this message
Liam Young (gnuoy) wrote : Posted in a previous version of this proposal

Thanks for this mp Seyeong Kim, this is a great addition to the charm functionality. One small thing, please could you add quota support to the kilo template as well ? I think that the kilo template probably landed after you submitted this mp, so apologies for that.

review: Needs Fixing
Revision history for this message
Seyeong Kim (seyeongkim) wrote :

new options added to kilo

do i need to add this also in config.yaml and neutron.conf for kilo templates?

quota_firewall = 1
quota_firewall_policy = 1
quota_firewall_rule = 100

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

charm_lint_check #1948 neutron-api-next for xtrusia mp249468
    LINT OK: passed

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

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

charm_unit_test #1738 neutron-api-next for xtrusia mp249468
    UNIT OK: passed

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

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

charm_amulet_test #1889 neutron-api-next for xtrusia mp249468
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

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

78. By Seyeong Kim

rebase 1

79. By Seyeong Kim

rebase 2

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

charm_lint_check #2204 neutron-api-next for xtrusia mp249468
    LINT OK: passed

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

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

charm_unit_test #1993 neutron-api-next for xtrusia mp249468
    UNIT OK: passed

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

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

charm_amulet_test #2150 neutron-api-next for xtrusia mp249468
    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/10396288/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2150/

Revision history for this message
Liam Young (gnuoy) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches