Merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
- Trusty Tahr (14.04)
- git
- Merge into next
Status: | Merged |
---|---|
Merged at revision: | 102 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next |
Diff against target: |
1046 lines (+676/-32) (has conflicts) 20 files modified
.bzrignore (+1/-0) Makefile (+3/-2) README.md (+87/-0) actions.yaml (+2/-0) actions/git_reinstall.py (+45/-0) config.yaml (+16/-0) hooks/charmhelpers/contrib/openstack/utils.py (+18/-6) hooks/neutron_api_hooks.py (+13/-2) hooks/neutron_api_utils.py (+114/-1) templates/git/neutron_sudoers (+4/-0) templates/git/upstart/neutron-server.upstart (+22/-0) tests/16-basic-trusty-icehouse-git (+9/-0) tests/16-basic-trusty-juno (+0/-11) tests/17-basic-trusty-juno (+11/-0) tests/18-basic-trusty-juno-git (+12/-0) tests/basic_deployment.py (+29/-4) unit_tests/__init__.py (+2/-0) unit_tests/test_actions_git_reinstall.py (+105/-0) unit_tests/test_neutron_api_hooks.py (+87/-2) unit_tests/test_neutron_api_utils.py (+96/-4) Text conflict in hooks/charmhelpers/contrib/openstack/utils.py |
To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/neutron-api/git |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Beisner (community) | Needs Fixing | ||
OpenStack Charmers | Pending | ||
Review via email:
|
Commit message
Description of the change
- 87. By Corey Bryant
-
Deploy from source
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #2873 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #2903 neutron-api-next for corey.bryant mp254991
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://
Build: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Ryan Beisner (1chb1n) wrote : | # |
Baseline neutron-api/next amulet tests are now passing. It looks like a manual juju environment name override in the Makefile is the cause for the amulet fail.
FYI - If you wish to not trigger tests on each future commit to this branch, you can set your MP status to Work In Progress until ready for review.
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Corey Bryant (corey.bryant) wrote : | # |
oops, if that's in the Makefile it's a mistake. I'll look.
On Tue, Apr 7, 2015 at 7:51 AM, Ryan Beisner <email address hidden>
wrote:
> Review: Needs Fixing
>
> Baseline neutron-api/next amulet tests are now passing. It looks like a
> manual juju environment name override in the Makefile is the cause for the
> amulet fail.
>
> FYI - If you wish to not trigger tests on each future commit to this
> branch, you can set your MP status to Work In Progress until ready for
> review.
> --
>
> https:/
> You are the owner of lp:~corey.bryant/charms/trusty/neutron-api/git.
>
--
Regards,
Corey
- 88. By Corey Bryant
-
Remove env from juju test in Makefile
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Corey Bryant (corey.bryant) wrote : | # |
Fix pushed for Makefile juju test env mistake.
On Tue, Apr 7, 2015 at 8:08 AM, Corey Bryant <email address hidden>
wrote:
> oops, if that's in the Makefile it's a mistake. I'll look.
>
> On Tue, Apr 7, 2015 at 7:51 AM, Ryan Beisner <email address hidden>
> wrote:
>
>> Review: Needs Fixing
>>
>> Baseline neutron-api/next amulet tests are now passing. It looks like a
>> manual juju environment name override in the Makefile is the cause for the
>> amulet fail.
>>
>> FYI - If you wish to not trigger tests on each future commit to this
>> branch, you can set your MP status to Work In Progress until ready for
>> review.
>> --
>>
>> https:/
>> You are the owner of lp:~corey.bryant/charms/trusty/neutron-api/git.
>>
>
>
>
> --
> Regards,
> Corey
>
--
Regards,
Corey
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3103 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #2891 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #2925 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 89. By Corey Bryant
-
Get http_proxy from AMULET_HTTP_PROXY env var
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3284 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3072 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3101 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 90. By Corey Bryant
-
Move deploy from source template files to templates/git
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3291 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3079 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3108 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 91. By Corey Bryant
-
Bulk copy files to /etc/neutron
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3301 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3089 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
- 92. By Corey Bryant
-
Turn DEBUG on by default for amulet tests
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3304 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3092 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3119 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3123 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 93. By Corey Bryant
-
Run config-changed hook after git-reinstall action installs from source
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3316 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3104 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3137 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 94. By Corey Bryant
-
Fixup test_git_
reinstall_ exception( )
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3395 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3183 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
- 95. By Corey Bryant
-
Merge next branch
- 96. By Corey Bryant
-
Sync charm-helpers
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3403 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3191 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3185 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 97. By Corey Bryant
-
Move config_changed into try block
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3411 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3199 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3196 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3204 neutron-api-next for corey.bryant mp254991
AMULET OK: passed
Build: http://
- 98. By Corey Bryant
-
Sync charm-helpers
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #3452 neutron-api-next for corey.bryant mp254991
LINT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #3240 neutron-api-next for corey.bryant mp254991
UNIT OK: passed
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #3250 neutron-api-next for corey.bryant mp254991
AMULET FAIL: amulet-test failed
AMULET Results (max last 2 lines):
make: *** [test] Error 124
ERROR:root:Make target returned non-zero.
Full amulet test output: http://
Build: http://
charm_lint_check #3085 neutron-api-next for corey.bryant mp254991
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/3085/