Commit 64207e303529b7fceb3b8b0f0a65f8f49b3f9b26 - python-castellan

Change keystone endpoint DevStack was changed so that keystone uses uwsgi [1]. This means we can't call keystone with the port number anymore. 1. https://review.openstack.org/#/c/456344/ Change-Id: I349b689e8030c8c2a7313b9781973952ead29c75 Kaitlin Farr 6 years ago

5 changed file(s) with 5 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all

-1

castellan/key_manager/barbican_key_manager.py less more

52	52	cfg.StrOpt('barbican_api_version',
53	53	help='Version of the Barbican API, for example: "v1"'),
54	54	cfg.StrOpt('auth_endpoint',
55		default='http://localhost:5000/v3',
	55	default='http://localhost/identity/v3',
56	56	help='Use this endpoint to connect to Keystone'),
57	57	cfg.IntOpt('retry_delay',
58	58	default=1,

-1

castellan/tests/functional/config.py less more

21	21	identity_group = cfg.OptGroup(name='identity')
22	22	identity_options = [
23	23	cfg.StrOpt('auth_url',
24		default='http://localhost:5000/v3',
	24	default='http://localhost/identity/v3',
25	25	help='Keystone endpoint'),
26	26	cfg.StrOpt('username',
27	27	default='admin',

-1

castellan/tests/unit/test_options.py less more

38	38	self.assertEqual(barbican_api_version,
39	39	conf.get(bkm.BARBICAN_OPT_GROUP).barbican_api_version)
40	40
41		auth_endpoint = 'http://test-server.org:5000/'
	41	auth_endpoint = 'http://test-server.org/identity'
42	42	options.set_defaults(conf, auth_endpoint=auth_endpoint)
43	43	self.assertEqual(auth_endpoint,
44	44	conf.get(bkm.BARBICAN_OPT_GROUP).auth_endpoint)

-1

doc/source/testing.rst less more

68	68	username = 'admin'
69	69	password = 'openstack'
70	70	project_name = 'admin'
71		auth_url = 'http://localhost:5000/v3'
	71	auth_url = 'http://localhost/identity/v3'
72	72
73	73	Once you have the appropriate services running and configured you can execute
74	74	the functional tests through tox.

-1

doc/source/usage.rst less more

94	94	username = 'admin'
95	95	password = 'openstack'
96	96	project_name = 'admin'
97		auth_url = 'http://localhost:5000/'
	97	auth_url = 'http://localhost/identity/v3'
98	98	auth = identity.Password(auth_url=auth_url,
99	99	username=username,
100	100	password=password,