Merge lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/n1kv into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

Proposed by Shiv Prasad Rao
Status: Superseded
Proposed branch: lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/n1kv
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 1976 lines (+597/-368)
13 files modified
hooks/charmhelpers/contrib/network/ip.py (+50/-48)
hooks/charmhelpers/contrib/openstack/context.py (+303/-215)
hooks/charmhelpers/contrib/openstack/neutron.py (+18/-2)
hooks/charmhelpers/contrib/openstack/utils.py (+24/-0)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+81/-97)
hooks/charmhelpers/core/hookenv.py (+6/-0)
hooks/charmhelpers/core/host.py (+8/-2)
hooks/charmhelpers/core/services/__init__.py (+2/-2)
hooks/charmhelpers/fetch/__init__.py (+5/-1)
hooks/charmhelpers/fetch/giturl.py (+44/-0)
templates/icehouse/cisco_plugins.ini (+43/-0)
templates/icehouse/nova.conf (+12/-0)
tests/basic_deployment.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~springfield-team/charms/trusty/nova-cloud-controller/n1kv
Reviewer Review Type Date Requested Status
Edward Hope-Morley Pending
Review via email: mp+242447@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-11-20.

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

UOSCI bot says:
charm_lint_check #1166 nova-cloud-controller-next for shivrao mp242447
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: http://paste.ubuntu.com/9137369/
Build: http://10.98.191.181:8080/job/charm_lint_check/1166/

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

UOSCI bot says:
charm_unit_test #1000 nova-cloud-controller-next for shivrao mp242447
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 442 145 67% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 630-669, 679-694, 702-706, 731-740, 764, 769-777, 803, 853-856
  hooks/nova_cc_utils 445 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 544, 593-595, 600-603, 608, 612, 636-637, 651-653, 674-675, 681-704, 708-714, 718-724, 730, 736, 743, 754-758, 843, 903-909, 913-915, 919-922, 926-938
  TOTAL 1038 366 65%
  Ran 96 tests in 8.559s
  OK

Full unit test output: http://paste.ubuntu.com/9137388/
Build: http://10.98.191.181:8080/job/charm_unit_test/1000/

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

UOSCI bot says:
charm_amulet_test #508 nova-cloud-controller-next for shivrao mp242447
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  WARNING cannot delete security group "juju-osci-sv05-0". Used by another environmenERROR:root:Make target returned non-zero.
t?
  juju-test INFO : Results: 0 passed, 2 failed, 1 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

Full amulet test output: http://paste.ubuntu.com/9137940/
Build: http://10.98.191.181:8080/job/charm_amulet_test/508/

128. By Jorge Niedbalski

[all] resync with /next && charm helpers "make sync"

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

UOSCI bot says:
charm_lint_check #1168 nova-cloud-controller-next for shivrao mp242447
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: http://paste.ubuntu.com/9150464/
Build: http://10.98.191.181:8080/job/charm_lint_check/1168/

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

UOSCI bot says:
charm_unit_test #1002 nova-cloud-controller-next for shivrao mp242447
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 442 145 67% 132-135, 148-149, 173, 184-185, 189, 221, 226-231, 242, 322-325, 333-336, 342-345, 355-371, 380-382, 392-406, 410-419, 505, 515, 519-520, 573, 579-589, 594-605, 615-625, 630-669, 679-694, 702-706, 731-740, 764, 769-777, 803, 853-856
  hooks/nova_cc_utils 445 112 75% 296-301, 312-315, 325-326, 382, 384, 430-432, 436, 450-458, 465-470, 474-488, 544, 593-595, 600-603, 608, 612, 636-637, 651-653, 674-675, 681-704, 708-714, 718-724, 730, 736, 743, 754-758, 843, 903-909, 913-915, 919-922, 926-938
  TOTAL 1038 366 65%
  Ran 96 tests in 8.973s
  OK

Full unit test output: http://paste.ubuntu.com/9150468/
Build: http://10.98.191.181:8080/job/charm_unit_test/1002/

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

UOSCI bot says:
charm_amulet_test #510 nova-cloud-controller-next for shivrao mp242447
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  ERROR waited for 10m0s without being able to connect: ssh: connect to host 10.215.3.235 port 22: No route to host
  juju-test.conductor WARNING : Could not bootstrap osci-sv05, got Bootstrap returned with an exit > 0. Skipping
  juju-test INFO : Results: 0 passed, 0 failed, 3 errored
  ERROR subprocess encountered error code 124
  make: *** [test] Error 124

Full amulet test output: http://paste.ubuntu.com/9151027/
Build: http://10.98.191.181:8080/job/charm_amulet_test/510/

129. By Shiv Prasad Rao

Changes for n1kv

130. By Edward Hope-Morley

[hopem] synced /next

Unmerged revisions

130. By Edward Hope-Morley

[hopem] synced /next

129. By Shiv Prasad Rao

Changes for n1kv

128. By Jorge Niedbalski

[all] resync with /next && charm helpers "make sync"

127. By Shiv Prasad Rao

Additional changes for n1kv

126. By Shiv Prasad Rao

Cisco Nexus 1000V changes

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