Juju Charms Collection
keystone package

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

  1. Trusty Tahr (14.04)
  2. next-haproxy-always
  3. Merge into next
Proposed by Liam Young
Status: Merged
Merged at revision: 99
Proposed branch: lp:~gnuoy/charms/trusty/keystone/next-haproxy-always
Merge into: lp:~openstack-charmers-archive/charms/trusty/keystone/next
Diff against target: 85 lines (+18/-11)
3 files modified
hooks/keystone_context.py (+8/-4)
hooks/keystone_utils.py (+8/-5)
tests/basic_deployment.py (+2/-2)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/keystone/next-haproxy-always
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+242900@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 #1231 keystone-next for gnuoy mp242900
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option ssl_ca has no default value
  I: config.yaml: option os-public-network has no default value
  I: config.yaml: option os-admin-network 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

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

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

UOSCI bot says:
charm_unit_test #1065 keystone-next for gnuoy mp242900
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/keystone_ssl 158 132 16% 106-128, 132-146, 150-158, 162-172, 176-177, 182-193, 197-206, 210-221, 225-237, 243-256, 259-266, 269-279, 282-296, 299-302
  hooks/keystone_utils 387 202 48% 204, 218, 242-248, 291-302, 309-324, 331-339, 344-354, 361-387, 392-401, 406-420, 425-447, 452-469, 483-506, 515-520, 525, 532-542, 547-555, 560-565, 569-576, 584-589, 600-615, 619-627, 652-653, 732, 735, 784-797, 821-825, 829-841
  TOTAL 797 390 51%
  Ran 38 tests in 3.278s
  OK

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

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

UOSCI bot says:
charm_amulet_test #534 keystone-next for gnuoy mp242900
    AMULET FAIL: amulet-test failed

AMULET Results (max last 5 lines):
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
  WARNING cannot delete security group "juju-osci-sv05-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/9253143/
Build: http://10.98.191.181:8080/job/charm_amulet_test/534/

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

Needs some amulet test case fixes as well please

review: Needs Fixing
lp:~gnuoy/charms/trusty/keystone/next-haproxy-always updated
92. By Liam Young

Merged next in

93. By Liam Young

Sync charmhelpers

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

charm_lint_check #307 keystone-next for gnuoy mp242900
    LINT OK: passed

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

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

charm_unit_test #335 keystone-next for gnuoy mp242900
    UNIT OK: passed

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

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

charm_amulet_test #470 keystone-next for gnuoy mp242900
    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/9568671/
Build: http://10.245.162.77:8080/job/charm_amulet_test/470/

lp:~gnuoy/charms/trusty/keystone/next-haproxy-always updated
94. By Liam Young

charmhelper sync

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

charm_lint_check #525 keystone-next for gnuoy mp242900
    LINT OK: passed

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

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

charm_unit_test #554 keystone-next for gnuoy mp242900
    UNIT OK: passed

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

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

charm_amulet_test #681 keystone-next for gnuoy mp242900
    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/9675712/
Build: http://10.245.162.77:8080/job/charm_amulet_test/681/

lp:~gnuoy/charms/trusty/keystone/next-haproxy-always updated
95. By Liam Young

Fix amulet tests broken by my last fix

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

charm_lint_check #537 keystone-next for gnuoy mp242900
    LINT OK: passed

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

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

charm_unit_test #566 keystone-next for gnuoy mp242900
    UNIT OK: passed

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

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

charm_amulet_test #693 keystone-next for gnuoy mp242900
    AMULET OK: passed

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

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
=== modified file 'hooks/keystone_context.py'
--- hooks/keystone_context.py 2014-11-14 02:16:38 +0000
+++ hooks/keystone_context.py 2015-01-05 16:01:10 +0000
@@ -72,8 +72,10 @@
72 listen_ports['public_port'] = api_port('keystone-public')72 listen_ports['public_port'] = api_port('keystone-public')
7373
74 # Apache ports74 # Apache ports
75 a_admin_port = determine_apache_port(api_port('keystone-admin'))75 a_admin_port = determine_apache_port(api_port('keystone-admin'),
76 a_public_port = determine_apache_port(api_port('keystone-public'))76 singlenode_mode=True)
77 a_public_port = determine_apache_port(api_port('keystone-public'),
78 singlenode_mode=True)
7779
78 port_mapping = {80 port_mapping = {
79 'admin-port': [81 'admin-port': [
@@ -100,8 +102,10 @@
100 )102 )
101 ctxt = {}103 ctxt = {}
102 ctxt['token'] = set_admin_token(config('admin-token'))104 ctxt['token'] = set_admin_token(config('admin-token'))
103 ctxt['admin_port'] = determine_api_port(api_port('keystone-admin'))105 ctxt['admin_port'] = determine_api_port(api_port('keystone-admin'),
104 ctxt['public_port'] = determine_api_port(api_port('keystone-public'))106 singlenode_mode=True)
107 ctxt['public_port'] = determine_api_port(api_port('keystone-public'),
108 singlenode_mode=True)
105 ctxt['debug'] = config('debug') in ['yes', 'true', 'True']109 ctxt['debug'] = config('debug') in ['yes', 'true', 'True']
106 ctxt['verbose'] = config('verbose') in ['yes', 'true', 'True']110 ctxt['verbose'] = config('verbose') in ['yes', 'true', 'True']
107 ctxt['identity_backend'] = config('identity-backend')111 ctxt['identity_backend'] = config('identity-backend')
108112
=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py 2014-12-17 17:54:26 +0000
+++ hooks/keystone_utils.py 2015-01-05 16:01:10 +0000
@@ -125,7 +125,7 @@
125 context.WorkerConfigContext()],125 context.WorkerConfigContext()],
126 }),126 }),
127 (HAPROXY_CONF, {127 (HAPROXY_CONF, {
128 'contexts': [context.HAProxyContext(),128 'contexts': [context.HAProxyContext(singlenode_mode=True),
129 keystone_context.HAProxyContext()],129 keystone_context.HAProxyContext()],
130 'services': ['haproxy'],130 'services': ['haproxy'],
131 }),131 }),
@@ -247,9 +247,10 @@
247def save_script_rc():247def save_script_rc():
248 env_vars = {'OPENSTACK_SERVICE_KEYSTONE': 'keystone',248 env_vars = {'OPENSTACK_SERVICE_KEYSTONE': 'keystone',
249 'OPENSTACK_PORT_ADMIN': determine_api_port(249 'OPENSTACK_PORT_ADMIN': determine_api_port(
250 api_port('keystone-admin')),250 api_port('keystone-admin'), singlenode_mode=True),
251 'OPENSTACK_PORT_PUBLIC': determine_api_port(251 'OPENSTACK_PORT_PUBLIC': determine_api_port(
252 api_port('keystone-public'))}252 api_port('keystone-public'),
253 singlenode_mode=True)}
253 _save_script_rc(**env_vars)254 _save_script_rc(**env_vars)
254255
255256
@@ -297,10 +298,12 @@
297 ipv6_addr = get_ipv6_addr(exc_list=[config('vip')])[0]298 ipv6_addr = get_ipv6_addr(exc_list=[config('vip')])[0]
298 endpoint_url = 'http://[%s]:{}/v2.0/' % ipv6_addr299 endpoint_url = 'http://[%s]:{}/v2.0/' % ipv6_addr
299 local_endpoint = endpoint_url.format(300 local_endpoint = endpoint_url.format(
300 determine_api_port(api_port('keystone-admin')))301 determine_api_port(api_port('keystone-admin'),
302 singlenode_mode=True))
301 else:303 else:
302 local_endpoint = 'http://localhost:{}/v2.0/'.format(304 local_endpoint = 'http://localhost:{}/v2.0/'.format(
303 determine_api_port(api_port('keystone-admin')))305 determine_api_port(api_port('keystone-admin'),
306 singlenode_mode=True))
304307
305 return local_endpoint308 return local_endpoint
306309
307310
=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py 2015-01-05 14:44:10 +0000
+++ tests/basic_deployment.py 2015-01-05 16:01:10 +0000
@@ -304,8 +304,8 @@
304 conf = '/etc/keystone/keystone.conf'304 conf = '/etc/keystone/keystone.conf'
305 relation = unit.relation('identity-service', 'cinder:identity-service')305 relation = unit.relation('identity-service', 'cinder:identity-service')
306 expected = {'admin_token': relation['admin_token'],306 expected = {'admin_token': relation['admin_token'],
307 'admin_port': relation['auth_port'],307 'admin_port': '35347',
308 'public_port': relation['service_port'],308 'public_port': '4990',
309 'use_syslog': 'False',309 'use_syslog': 'False',
310 'log_config': '/etc/keystone/logging.conf',310 'log_config': '/etc/keystone/logging.conf',
311 'debug': 'False',311 'debug': 'False',

Subscribers

People subscribed via source and target branches