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

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

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-testing-bot (uosci-testing-bot)]

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-testing-bot (uosci-testing-bot)]

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)]

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

review: Needs Fixing

[lp:~gnuoy/charms/trusty/glance/next-haproxy-always]

84. By Liam Young on 2014-12-19

Merged next in

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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/

[lp:~gnuoy/charms/trusty/glance/next-haproxy-always]

85. By Liam Young on 2014-12-19

Charmhelper sync

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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/

[lp:~gnuoy/charms/trusty/glance/next-haproxy-always]

86. By Liam Young on 2015-01-05

charmhelper sync

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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

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

[uosci-testing-bot (uosci-testing-bot)]

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/

=== 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 @@
         Also used to extend glance-api.conf context with correct bind_port
         '''
         haproxy_port = 9292
-        apache_port = determine_apache_port(9292)
-        api_port = determine_api_port(9292)
+        apache_port = determine_apache_port(9292, singlenode_mode=True)
+        api_port = determine_api_port(9292, singlenode_mode=True)
 
         ctxt = {
             'service_ports': {'glance_api': [haproxy_port, apache_port]},

=== 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 @@
         'services': ['glance-api', 'glance-registry']
     }),
     (HAPROXY_CONF, {
-        'hook_contexts': [context.HAProxyContext(),
+        'hook_contexts': [context.HAProxyContext(singlenode_mode=True),
                           glance_contexts.HAProxyContext()],
         'services': ['haproxy'],
     }),