Merge lp://staging/~openstack-charmers/charms/trusty/nova-compute/0mq into lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next
- Trusty Tahr (14.04)
- 0mq
- Merge into next
Status: | Merged |
---|---|
Merged at revision: | 117 |
Proposed branch: | lp://staging/~openstack-charmers/charms/trusty/nova-compute/0mq |
Merge into: | lp://staging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
733 lines (+381/-92) 13 files modified
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2) hooks/charmhelpers/contrib/openstack/context.py (+144/-1) hooks/charmhelpers/contrib/openstack/templates/git.upstart (+13/-0) hooks/charmhelpers/contrib/openstack/templates/section-zeromq (+14/-0) hooks/charmhelpers/contrib/openstack/templates/zeromq (+0/-14) hooks/charmhelpers/contrib/openstack/utils.py (+124/-69) hooks/charmhelpers/core/unitdata.py (+1/-1) hooks/nova_compute_hooks.py (+18/-0) hooks/nova_compute_utils.py (+6/-0) metadata.yaml (+3/-3) templates/kilo/nova.conf (+2/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+25/-2) unit_tests/test_nova_compute_hooks.py (+6/-0) |
To merge this branch: | bzr merge lp://staging/~openstack-charmers/charms/trusty/nova-compute/0mq |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Ryan Beisner (community) | Needs Fixing | ||
James Page | Needs Fixing | ||
Review via email: mp+238879@code.staging.launchpad.net |
Commit message
Description of the change
Ryan Beisner (1chb1n) wrote : | # |
Ryan Beisner (1chb1n) wrote : | # |
UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.
#501 nova-compute-next for gnuoy mp238879
charm_unit_test
This build:
http://
MP URL:
https:/
Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/0mq
Results summary:
UNIT FAIL: unit-test failed
UNIT Results (max last 25 lines) from
/var/lib/
get_
File "hooks/
res = func(*args, **kwargs)
File "hooks/
config_data = json.loads(
File "/usr/lib/
process = Popen(stdout=PIPE, *popenargs, **kwargs)
File "/usr/lib/
errread, errwrite)
File "/usr/lib/
raise child_exception
OSError: [Errno 2] No such file or directory
Name Stmts Miss Cover Missing
-------
nova_compute_
nova_compute_hooks 141 15 89% 81, 99-100, 128, 194, 252, 257-258, 264, 270, 278, 282-285
nova_compute_utils 230 111 52% 163-219, 227, 232-235, 270-272, 279, 283-286, 294-302, 306, 315-324, 337-356, 382-383, 387-388, 407-428, 445-455, 469-470, 474, 479-480
-------
TOTAL 575 196 66%
-------
Ran 56 tests in 7.145s
FAILED (SKIP=5, errors=3)
make: *** [unit_test] Error 1
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://
- 92. By Liam Young
-
Fix unit tests and lint
Ryan Beisner (1chb1n) wrote : | # |
UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.
#703 nova-compute-next for gnuoy mp238879
charm_lint_check
This build:
http://
MP URL:
https:/
Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/0mq
Results summary:
LINT OK: believed to pass, but you should confirm results
LINT Results (max last 25 lines) from
/var/lib/
W: no README file
I: relation neutron-plugin has no hooks
I: missing recommended hook start
I: missing recommended hook stop
I: config.yaml: option os-data-network has no default value
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-
I: config.yaml: option migration-auth-type 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://
Ryan Beisner (1chb1n) wrote : | # |
UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.
#509 nova-compute-next for gnuoy mp238879
charm_unit_test
This build:
http://
MP URL:
https:/
Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/0mq
Results summary:
UNIT OK: believed to pass, but you should confirm results
UNIT Results (max last 25 lines) from
/var/lib/
Starting unit tests...
......S.
Name Stmts Miss Cover Missing
-------
nova_compute_
nova_compute_hooks 141 15 89% 81, 99-100, 128, 194, 252, 257-258, 264, 270, 278, 282-285
nova_compute_utils 230 111 52% 163-219, 227, 232-235, 270-272, 279, 283-286, 294-302, 306, 315-324, 337-356, 382-383, 387-388, 407-428, 445-455, 469-470, 474, 479-480
-------
TOTAL 575 196 66%
-------
Ran 56 tests in 2.899s
OK (SKIP=5)
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://
James Page (james-page) : | # |
- 93. By Liam Young
-
Remove superfluous stopstart=True from 0mq config restart_on_change decorator
Liam Young (gnuoy) wrote : | # |
Removed superfluous stopstart=True from 0mq config restart_on_change decorator as James suggested in inline comment
Ryan Beisner (1chb1n) wrote : | # |
UOSCI bot says:
charm_lint_check #736 nova-compute-next for gnuoy mp238879
LINT OK: believed to pass, but you should confirm results
LINT Results (max last 4 lines) from
/var/lib/
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-
I: config.yaml: option migration-auth-type has no default value
Full lint output: http://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
UOSCI bot says:
charm_unit_test #544 nova-compute-next for gnuoy mp238879
UNIT OK: believed to pass, but you should confirm results
UNIT Results (max last 4 lines) from
/var/lib/
-------
Ran 56 tests in 2.752s
OK (SKIP=5)
Full unit output: http://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
UOSCI bot says:
charm_amulet_test #289 nova-compute-next for gnuoy mp238879
AMULET OK: believed to pass, but you should confirm results
AMULET Results (max last 4 lines) from
/var/lib/
juju-test.conductor DEBUG : Tearing down osci-sv04 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv04"
WARNING cannot delete security group "juju-osci-sv04-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored
Full amulet output: http://
Build: http://
- 94. By James Page
-
Rebase on next
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #165 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #199 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #179 nova-compute-next for gnuoy mp238879
AMULET FAIL: amulet-test failed
AMULET Results (max last 2 lines):
ERROR subprocess encountered error code 124
make: *** [test] Error 124
Full amulet test output: http://
Build: http://
- 95. By James Page
-
Rebase on next
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #709 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #738 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #894 nova-compute-next for gnuoy mp238879
AMULET OK: passed
Ryan Beisner (1chb1n) wrote : | # |
T-J & U-J deploy tests fail with:
http://
2015-01-13 11:41:57 [DEBUG] deployer.import: Waiting for units before adding relations
2015-01-13 11:42:01 [DEBUG] deployer.env: Delta unit: glance/0 change:error
2015-01-13 11:42:01 [ERROR] deployer.env: The following units had errors:
unit: glance/0: machine: 6 agent-state: error details: hook failed: "install"
2015-01-13 11:42:01 [INFO] deployer.cli: Deployment stopped. run time: 310.34
2015-01-13 11:41:56 INFO juju.worker.uniter uniter.go:480 running "install" hook
2015-01-13 11:41:56 INFO worker.uniter.jujuc server.go:102 running hook tool "juju-log" ["Installing python-netifaces with options: ['--option=
2015-01-13 11:41:56 DEBUG worker.uniter.jujuc server.go:103 hook context id "glance/
2015-01-13 11:41:56 INFO juju-log Installing python-netifaces with options: ['--option=
2015-01-13 11:41:56 INFO install Reading package lists...
2015-01-13 11:41:56 INFO install Building dependency tree...
2015-01-13 11:41:56 INFO install Reading state information...
2015-01-13 11:41:57 INFO install The following NEW packages will be installed:
2015-01-13 11:41:57 INFO install python-netifaces
2015-01-13 11:41:57 INFO install 0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
2015-01-13 11:41:57 INFO install Need to get 16.7 kB of archives.
2015-01-13 11:41:57 INFO install After this operation, 77.8 kB of additional disk space will be used.
2015-01-13 11:41:57 INFO install WARNING: The following packages cannot be authenticated!
2015-01-13 11:41:57 INFO install python-netifaces
2015-01-13 11:41:57 INFO install E: There are problems and -y was used without --force-yes
2015-01-13 11:41:57 INFO install Traceback (most recent call last):
2015-01-13 11:41:57 INFO install File "/var/lib/
2015-01-13 11:41:57 INFO install from glance_utils import (
2015-01-13 11:41:57 INFO install File "/var/lib/
2015-01-13 11:41:57 INFO install import glance_contexts
2015-01-13 11:41:57 INFO install File "/var/lib/
2015-01-13 11:41:57 INFO install from charmhelpers.
2015-01-13 11:41:57 INFO install File "/var/lib/
2015-01-13 11:41:57 INFO install from charmhelpers.
2015-01-13 11:41:57 INFO install File "/var/lib/
2015-01-13 11:41:57 INFO install from charmhelpers.
2015-01-13 11:41:57 INFO install File "/var/lib/
2015-01-13 11:41:57 I...
- 96. By James Page
-
Resync 0mq helpers, use centralized template
- 97. By James Page
-
Drop parts from zeromq snippet use
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #841 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #870 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #1065 nova-compute-next for gnuoy mp238879
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://
Build: http://
- 98. By James Page
-
Resync helper
- 99. By James Page
-
Resync helper
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #869 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #898 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #1093 nova-compute-next for gnuoy mp238879
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://
Build: http://
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #875 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #904 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #1099 nova-compute-next for gnuoy mp238879
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://
Build: http://
Ryan Beisner (1chb1n) wrote : | # |
FYI, icehouse deploy tests fail with:
(juno passes)
13:06:05 2015-01-20 13:06:05 [ERROR] deployer.env: The following units had errors:
13:06:05 unit: nova-compute/1: machine: 15 agent-state: error details: hook failed: "config-changed"
2015-01-20 13:06:02 INFO juju-log Rendering from template: nova.conf
2015-01-20 13:06:02 INFO config-changed Traceback (most recent call last):
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed main()
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed hooks.execute(
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed self._hooks[
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed f(*args)
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed CONFIGS.write_all()
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed [self.write(k) for k in six.iterkeys(
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed _out = self.render(
2015-01-20 13:06:02 INFO config-changed File "/var/lib/
2015-01-20 13:06:02 INFO config-changed return template.
2015-01-20 13:06:02 INFO config-changed File "/usr/lib/
2015-01-20 13:06:02 INFO config-changed return self.environmen
2015-01-20 13:06:02 INFO config-changed File "/usr/lib/
2015-01-20 13:06:02 INFO config-changed reraise(exc_type, exc_value, tb)
2015-01-20 13:06:02 INFO config-changed File "templates/
2015-01-20 13:06:02 INFO config-changed {% include "parts/zeromq" %}
2015-01-20 13:06:02 INFO config-changed jinja2.
2015-01-20 13:06:02 ERROR juju.worker.uniter uniter.go:486 hook failed: exit status 1
- 100. By James Page
-
Rebase
- 101. By James Page
-
Drop icehouse specific config files - juno upwards only
- 102. By James Page
-
Add zeromq snippet for kilo
- 103. By James Page
-
Switch to trunk of charm-helpers
- 104. By James Page
-
Specialized zeromq snippet for kilo
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #2213 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #2002 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #2159 nova-compute-next for gnuoy mp238879
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://
Build: http://
- 105. By James Page
-
Fixup pydev
- 106. By James Page
-
Rebase
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #2683 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #2474 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #2512 nova-compute-next for gnuoy mp238879
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://
Build: http://
- 107. By James Page
-
Make 0mq support >= kilo
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_lint_check #2693 nova-compute-next for gnuoy mp238879
LINT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_unit_test #2484 nova-compute-next for gnuoy mp238879
UNIT OK: passed
uosci-testing-bot (uosci-testing-bot) wrote : | # |
charm_amulet_test #2522 nova-compute-next for gnuoy mp238879
AMULET OK: passed
Build: http://
- 108. By James Page
-
Rebase, resync
UOSCI bot says:
This MP triggered a test on the Ubuntu OSCI system. Here is a summary of results.
#695 nova-compute-next for gnuoy mp238879
charm_lint_check
This build: 10.98.191. 181:8080/ job/charm_ lint_check/ 695/
http://
MP URL: /code.launchpad .net/~openstack -charmers/ charms/ trusty/ nova-compute/ 0mq/+merge/ 238879
https:/
Proposed branch:
lp:~openstack-charmers/charms/trusty/nova-compute/0mq
Results summary:
LINT FAIL: lint-check failed
LINT Results (max last 25 lines) from jenkins/ workspace/ charm_lint_ check/make- lint.695: compute_ utils.py: 93:1: E101 indentation contains mixed spaces and tabs compute_ utils.py: 93:1: W191 indentation contains tabs compute_ utils.py: 93:8: E128 continuation line under-indented for visual indent
/var/lib/
hooks/nova_
hooks/nova_
hooks/nova_
make: *** [lint] Error 1
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. 10.98.191. 181:8080/
http://