x/anvil
Code Issues Proposed changes

Added more keystone redux adjustments.

Browse Source
This commit is contained in:
Joshua Harlow 2012-02-16 14:42:55 -08:00
parent 2cd8c5d39e
commit 86b5076122
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
conf/templates/keystone/default_catalog.templates.tpl Normal file
View File

@ -0,0 +1,30 @@
# config for TemplatedCatalog, using camelCase because I don't want to do
# translations for legacy compat
catalog.RegionOne.identity.publicURL = http://%SERVICE_HOST%:$(public_port)s/v2.0
catalog.RegionOne.identity.adminURL = http://%SERVICE_HOST%:$(admin_port)s/v2.0
catalog.RegionOne.identity.internalURL = http://%SERVICE_HOST%:$(public_port)s/v2.0
catalog.RegionOne.identity.name = 'Identity Service'
catalog.RegionOne.compute.publicURL = http://%SERVICE_HOST%:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.adminURL = http://%SERVICE_HOST%:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.internalURL = http://%SERVICE_HOST%:8774/v1.1/$(tenant_id)s
catalog.RegionOne.compute.name = 'Compute Service'
catalog.RegionOne.ec2.publicURL = http://%SERVICE_HOST%:8773/services/Cloud
catalog.RegionOne.ec2.adminURL = http://%SERVICE_HOST%:8773/services/Admin
catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud
catalog.RegionOne.ec2.name = 'EC2 Service'
catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1
catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1
catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1
catalog.RegionOne.image.name = 'Image Service'
catalog.RegionOne.object_store.publicURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s
catalog.RegionOne.object_store.adminURL = http://%SERVICE_HOST%:8080/
catalog.RegionOne.object_store.internalURL = http://%SERVICE_HOST%:8080/v1/AUTH_$(tenant_id)s
catalog.RegionOne.object_store.name = 'Swift Service'

6
devstack/components/keystone.py
View File

@ -38,7 +38,8 @@ CONFIG_DIR = "etc"
#simple confs
ROOT_CONF = "keystone.conf"
CONFIGS = [ROOT_CONF]
CATALOG_CONF = 'default_catalog.templates'
CONFIGS = [ROOT_CONF, CATALOG_CONF]
CFG_SECTION = 'DEFAULT'
#this is a special conf
@ -172,12 +173,10 @@ class KeystoneInstaller(comp.PythonInstallComponent):
#params with actual values
mp = dict()
if config_fn == ROOT_CONF:
host_ip = self.cfg.get('host', 'ip')
mp['DEST'] = self.appdir
mp['SQL_CONN'] = self.cfg.get_dbdsn(DB_NAME)
mp['KEYSTONE_DIR'] = self.appdir
elif config_fn == MANAGE_DATA_CONF:
host_ip = self.cfg.get('host', 'ip')
mp['ADMIN_PASSWORD'] = self.cfg.get('passwords', 'horizon_keystone_admin')
mp['ADMIN_USERNAME'] = 'admin'
mp['DEMO_USER_NAME'] = 'demo'
@ -185,6 +184,7 @@ class KeystoneInstaller(comp.PythonInstallComponent):
else:
mp['DEST'] = self.appdir
mp['BIN_DIR'] = self.bindir
mp['SERVICE_HOST'] = self.cfg.get('host', 'ip')
mp['CONFIG_FILE'] = sh.joinpths(self.cfgdir, ROOT_CONF)
return mp