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

Proposed by Liam Young on 2014-11-26
Status: Merged
Merged at revision: 90
Proposed branch: lp:~gnuoy/charms/trusty/glance/next-haproxy-always
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/next
Diff against target: 27 lines (+3/-3)
2 files modified
hooks/glance_contexts.py (+2/-2)
hooks/glance_utils.py (+1/-1)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/glance/next-haproxy-always
Reviewer Review Type Date Requested Status
James Page 2014-11-26 Needs Fixing on 2014-12-09
Review via email: mp+242901@code.launchpad.net
To post a comment you must log in.

UOSCI bot says:
charm_lint_check #1232 glance-next for gnuoy mp242901
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option os-internal-network has no default value
  I: config.yaml: option os-public-network has no default value
  OK

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

UOSCI bot says:
charm_unit_test #1066 glance-next for gnuoy mp242901
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/glance_relations 211 9 96% 289-290, 309-320
  hooks/glance_utils 91 8 91% 162, 255-267
  TOTAL 350 23 93%
  Ran 65 tests in 3.291s
  OK

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

UOSCI bot says:
charm_amulet_test #535 glance-next for gnuoy mp242901
    AMULET FAIL: amulet-test failed

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

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

James Page (james-page) :
review: Approve
James Page (james-page) wrote :

  juju-test.conductor.14-basic-precise-icehouse RESULT : ✘

review: Needs Fixing
84. By Liam Young on 2014-12-19

Merged next in

charm_lint_check #304 glance-next for gnuoy mp242901
    LINT OK: passed

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

charm_unit_test #332 glance-next for gnuoy mp242901
    UNIT OK: passed

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

charm_amulet_test #467 glance-next for gnuoy mp242901
    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/9568243/
Build: http://10.245.162.77:8080/job/charm_amulet_test/467/

85. By Liam Young on 2014-12-19

Charmhelper sync

charm_lint_check #308 glance-next for gnuoy mp242901
    LINT OK: passed

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

charm_unit_test #336 glance-next for gnuoy mp242901
    UNIT OK: passed

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

charm_amulet_test #471 glance-next for gnuoy mp242901
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
  juju-test INFO : Results: 1 passed, 1 failed, 0 errored
  ERROR subprocess encountered error code 1

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

86. By Liam Young on 2015-01-05

charmhelper sync

charm_lint_check #526 glance-next for gnuoy mp242901
    LINT OK: passed

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

charm_unit_test #555 glance-next for gnuoy mp242901
    UNIT OK: passed

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

charm_amulet_test #682 glance-next for gnuoy mp242901
    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/9675800/
Build: http://10.245.162.77:8080/job/charm_amulet_test/682/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/glance_contexts.py'
--- hooks/glance_contexts.py 2014-10-07 15:19:08 +0000
+++ hooks/glance_contexts.py 2015-01-05 09:30:37 +0000
@@ -75,8 +75,8 @@
75 Also used to extend glance-api.conf context with correct bind_port75 Also used to extend glance-api.conf context with correct bind_port
76 '''76 '''
77 haproxy_port = 929277 haproxy_port = 9292
78 apache_port = determine_apache_port(9292)78 apache_port = determine_apache_port(9292, singlenode_mode=True)
79 api_port = determine_api_port(9292)79 api_port = determine_api_port(9292, singlenode_mode=True)
8080
81 ctxt = {81 ctxt = {
82 'service_ports': {'glance_api': [haproxy_port, apache_port]},82 'service_ports': {'glance_api': [haproxy_port, apache_port]},
8383
=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py 2014-12-17 18:06:08 +0000
+++ hooks/glance_utils.py 2015-01-05 09:30:37 +0000
@@ -121,7 +121,7 @@
121 'services': ['glance-api', 'glance-registry']121 'services': ['glance-api', 'glance-registry']
122 }),122 }),
123 (HAPROXY_CONF, {123 (HAPROXY_CONF, {
124 'hook_contexts': [context.HAProxyContext(),124 'hook_contexts': [context.HAProxyContext(singlenode_mode=True),
125 glance_contexts.HAProxyContext()],125 glance_contexts.HAProxyContext()],
126 'services': ['haproxy'],126 'services': ['haproxy'],
127 }),127 }),

Subscribers

People subscribed via source and target branches