Juju Charms Collection
nova-cloud-controller package

Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

  1. Trusty Tahr (14.04)
  2. next-haproxy-always
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 132
Proposed branch: lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Diff against target: 72 lines (+24/-14)
3 files modified
hooks/nova_cc_context.py (+20/-10)
hooks/nova_cc_utils.py (+1/-1)
tests/basic_deployment.py (+3/-3)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+242898@code.launchpad.net
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 #1229 nova-cloud-controller-next for gnuoy mp242898
    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/9252825/
Build: http://10.98.191.181:8080/job/charm_lint_check/1229/

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

UOSCI bot says:
charm_unit_test #1063 nova-cloud-controller-next for gnuoy mp242898
    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.653s
  OK

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

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

UOSCI bot says:
charm_amulet_test #532 nova-cloud-controller-next for gnuoy mp242898
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv09"
  WARNING cannot delete security group "juju-osci-sv09-0". Used by another environment?
  juju-test INFO : Results: 1 passed, 2 failed, 0 errored
  ERROR subprocess encountered error code 2
  make: *** [test] Error 2

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

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

Amulet test failures need addressing

review: Needs Fixing
lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always updated
128. By Liam Young

Merged next in

129. By Liam Young

Sync charmhelpers

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

charm_lint_check #305 nova-cloud-controller-next for gnuoy mp242898
    LINT OK: passed

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

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

charm_unit_test #333 nova-cloud-controller-next for gnuoy mp242898
    UNIT OK: passed

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

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

charm_amulet_test #468 nova-cloud-controller-next for gnuoy mp242898
    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/9568684/
Build: http://10.245.162.77:8080/job/charm_amulet_test/468/

lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always updated
130. By Liam Young

charmhelper sync

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

charm_lint_check #523 nova-cloud-controller-next for gnuoy mp242898
    LINT OK: passed

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

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

charm_unit_test #552 nova-cloud-controller-next for gnuoy mp242898
    UNIT OK: passed

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

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

charm_amulet_test #679 nova-cloud-controller-next for gnuoy mp242898
    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/9675796/
Build: http://10.245.162.77:8080/job/charm_amulet_test/679/

lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always updated
131. By Liam Young

Fix port in amulet tests

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

charm_lint_check #529 nova-cloud-controller-next for gnuoy mp242898
    LINT OK: passed

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

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

charm_unit_test #558 nova-cloud-controller-next for gnuoy mp242898
    UNIT OK: passed

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

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

charm_amulet_test #685 nova-cloud-controller-next for gnuoy mp242898
    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/9676836/
Build: http://10.245.162.77:8080/job/charm_amulet_test/685/

lp:~gnuoy/charms/trusty/nova-cloud-controller/next-haproxy-always updated
132. By Liam Young

Actually fix amulet tests

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

charm_lint_check #536 nova-cloud-controller-next for gnuoy mp242898
    LINT OK: passed

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

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

charm_unit_test #565 nova-cloud-controller-next for gnuoy mp242898
    UNIT OK: passed

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

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

charm_amulet_test #692 nova-cloud-controller-next for gnuoy mp242898
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/692/

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 'hooks/nova_cc_context.py'
2--- hooks/nova_cc_context.py 2014-12-17 18:20:59 +0000
3+++ hooks/nova_cc_context.py 2015-01-05 14:40:35 +0000
4@@ -135,18 +135,28 @@
5
6 # determine which port api processes should bind to, depending
7 # on existence of haproxy + apache frontends
8- compute_api = determine_api_port(api_port('nova-api-os-compute'))
9- ec2_api = determine_api_port(api_port('nova-api-ec2'))
10- s3_api = determine_api_port(api_port('nova-objectstore'))
11- nvol_api = determine_api_port(api_port('nova-api-os-volume'))
12- neutron_api = determine_api_port(api_port('neutron-server'))
13+ compute_api = determine_api_port(api_port('nova-api-os-compute'),
14+ singlenode_mode=True)
15+ ec2_api = determine_api_port(api_port('nova-api-ec2'),
16+ singlenode_mode=True)
17+ s3_api = determine_api_port(api_port('nova-objectstore'),
18+ singlenode_mode=True)
19+ nvol_api = determine_api_port(api_port('nova-api-os-volume'),
20+ singlenode_mode=True)
21+ neutron_api = determine_api_port(api_port('neutron-server'),
22+ singlenode_mode=True)
23
24 # Apache ports
25- a_compute_api = determine_apache_port(api_port('nova-api-os-compute'))
26- a_ec2_api = determine_apache_port(api_port('nova-api-ec2'))
27- a_s3_api = determine_apache_port(api_port('nova-objectstore'))
28- a_nvol_api = determine_apache_port(api_port('nova-api-os-volume'))
29- a_neutron_api = determine_apache_port(api_port('neutron-server'))
30+ a_compute_api = determine_apache_port(api_port('nova-api-os-compute'),
31+ singlenode_mode=True)
32+ a_ec2_api = determine_apache_port(api_port('nova-api-ec2'),
33+ singlenode_mode=True)
34+ a_s3_api = determine_apache_port(api_port('nova-objectstore'),
35+ singlenode_mode=True)
36+ a_nvol_api = determine_apache_port(api_port('nova-api-os-volume'),
37+ singlenode_mode=True)
38+ a_neutron_api = determine_apache_port(api_port('neutron-server'),
39+ singlenode_mode=True)
40
41 # to be set in nova.conf accordingly.
42 listen_ports = {
43
44=== modified file 'hooks/nova_cc_utils.py'
45--- hooks/nova_cc_utils.py 2014-12-17 18:20:59 +0000
46+++ hooks/nova_cc_utils.py 2015-01-05 14:40:35 +0000
47@@ -175,7 +175,7 @@
48 'contexts': [nova_cc_context.NeutronCCContext()],
49 }),
50 (HAPROXY_CONF, {
51- 'contexts': [context.HAProxyContext(),
52+ 'contexts': [context.HAProxyContext(singlenode_mode=True),
53 nova_cc_context.HAProxyContext()],
54 'services': ['haproxy'],
55 }),
56
57=== modified file 'tests/basic_deployment.py'
58--- tests/basic_deployment.py 2014-10-23 18:03:32 +0000
59+++ tests/basic_deployment.py 2015-01-05 14:40:35 +0000
60@@ -467,9 +467,9 @@
61 'rabbit_host': rabbitmq_relation['hostname'],
62 'glance_api_servers': glance_relation['glance-api-server'],
63 'network_manager': 'nova.network.manager.FlatDHCPManager',
64- 's3_listen_port': '3333',
65- 'osapi_compute_listen_port': '8774',
66- 'ec2_listen_port': '8773'}
67+ 's3_listen_port': '3323',
68+ 'osapi_compute_listen_port': '8764',
69+ 'ec2_listen_port': '8763'}
70
71 ret = u.validate_config_data(unit, conf, 'DEFAULT', expected)
72 if ret:

Subscribers

People subscribed via source and target branches