openstack
/
keystone
Code Issues Proposed changes

Merge "Do not use keystone's config for nova's port"

This commit is contained in:
Jenkins 2014-07-11 23:36:17 +00:00 committed by Gerrit Code Review
parent e52311945a f18911ea14
commit bbfd58a6c1
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/default_catalog.templates
View File

@ -6,9 +6,9 @@ catalog.RegionOne.identity.internalURL = http://localhost:$(public_port)s/v2.0
catalog.RegionOne.identity.name = Identity Service
# fake compute service for now to help novaclient tests work
catalog.RegionOne.compute.publicURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.adminURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.internalURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.publicURL = http://localhost:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.adminURL = http://localhost:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.internalURL = http://localhost:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.name = Compute Service
catalog.RegionOne.volume.publicURL = http://localhost:8776/v1/$(tenant_id)s

9
etc/keystone.conf.sample
View File

@ -22,8 +22,13 @@
# Deprecated group/name - [DEFAULT]/bind_host
#admin_bind_host=0.0.0.0
# The port which the OpenStack Compute service listens on.
# (integer value)
# (Deprecated) The port which the OpenStack Compute service
# listens on. This option was only used for string replacement
# in the templated catalog backend. Templated catalogs should
# replace the "$(compute_port)s" substitution with the static
# port of the compute service. As of Juno, this option is
# deprecated and will be removed in the L release. (integer
# value)
#compute_port=8774
# The port number which the admin service listens on. (integer

9
keystone/common/config.py
View File

@ -41,8 +41,13 @@ FILE_OPTIONS = {
help='The IP address of the network interface for the '
'admin service to listen on.'),
cfg.IntOpt('compute_port', default=8774,
help='The port which the OpenStack Compute service '
'listens on.'),
help='(Deprecated) The port which the OpenStack Compute '
'service listens on. This option was only used for '
'string replacement in the templated catalog backend. '
'Templated catalogs should replace the '
'"$(compute_port)s" substitution with the static port '
'of the compute service. As of Juno, this option is '
'deprecated and will be removed in the L release.'),
cfg.IntOpt('admin_port', default=35357,
help='The port number which the admin service listens '
'on.'),

6
keystone/tests/default_catalog.templates
View File

@ -7,8 +7,8 @@ catalog.RegionOne.identity.name = 'Identity Service'
catalog.RegionOne.identity.id = 1
# fake compute service for now to help novaclient tests work
catalog.RegionOne.compute.publicURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.adminURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.internalURL = http://localhost:$(compute_port)s/v1.1/$(tenant_id)s
catalog.RegionOne.compute.publicURL = http://localhost:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.adminURL = http://localhost:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.internalURL = http://localhost:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.name = 'Compute Service'
catalog.RegionOne.compute.id = 2

2
keystone/tests/test_backend_sql.py
View File

@ -385,7 +385,7 @@ class SqlCatalog(SqlTests, test_backend.CatalogTests):
}
self.catalog_api.create_service(service['id'], service.copy())
malformed_url = "http://192.168.1.104:$(compute_port)s/v2/$(tenant)s"
malformed_url = "http://192.168.1.104:8774/v2/$(tenant)s"
endpoint = {
'id': uuid.uuid4().hex,
'region': uuid.uuid4().hex,

2
keystone/tests/test_backend_templated.py
View File

@ -67,7 +67,7 @@ class TestTemplatedCatalog(tests.TestCase, test_backend.CatalogTests):
(self.catalog_api.driver.templates
['RegionOne']['compute']['adminURL']) = \
'http://localhost:$(compute_port)s/v1.1/$(tenant)s'
'http://localhost:8774/v1.1/$(tenant)s'
# the malformed one has been removed
catalog_ref = self.catalog_api.get_catalog('foo', 'bar')

6
tools/sample_data.sh
View File

@ -159,9 +159,9 @@ keystone service-create --name=nova \
--description="Nova Compute Service")
if [[ -z "$DISABLE_ENDPOINTS" ]]; then
keystone endpoint-create --region RegionOne --service-id $NOVA_SERVICE \
--publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:\$(compute_port)s/v2/\$(tenant_id)s" \
--adminurl "http://$CONTROLLER_ADMIN_ADDRESS:\$(compute_port)s/v2/\$(tenant_id)s" \
--internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:\$(compute_port)s/v2/\$(tenant_id)s"
--publicurl "http://$CONTROLLER_PUBLIC_ADDRESS:8774/v2/\$(tenant_id)s" \
--adminurl "http://$CONTROLLER_ADMIN_ADDRESS:8774/v2/\$(tenant_id)s" \
--internalurl "http://$CONTROLLER_INTERNAL_ADDRESS:8774/v2/\$(tenant_id)s"
fi
#