openstack/aodh
Code Issues Proposed changes

Adding region name to service credentials

Browse Source 
Change-Id: Ic6515e8e1c4f12a3a7381d99bebd30db54d9385d
Closes-Bug: #1227146
This commit is contained in:
Bartosz Górski 2013-09-17 08:12:22 -07:00
parent 09e0f3fabf
commit e244ae7d4c
6 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceilometer/alarm/evaluator/__init__.py
View File

@ -49,6 +49,7 @@ class Evaluator(object):
auth_config = cfg.CONF.service_credentials auth_config = cfg.CONF.service_credentials
creds = dict( creds = dict(
os_auth_url=auth_config.os_auth_url, os_auth_url=auth_config.os_auth_url,
os_region_name=auth_config.os_region_name,
os_tenant_name=auth_config.os_tenant_name, os_tenant_name=auth_config.os_tenant_name,
os_password=auth_config.os_password, os_password=auth_config.os_password,
os_username=auth_config.os_username, os_username=auth_config.os_username,

1
ceilometer/alarm/service.py
View File

@ -80,6 +80,7 @@ class AlarmService(object):
auth_config = cfg.CONF.service_credentials auth_config = cfg.CONF.service_credentials
creds = dict( creds = dict(
os_auth_url=auth_config.os_auth_url, os_auth_url=auth_config.os_auth_url,
os_region_name=auth_config.os_region_name,
os_tenant_name=auth_config.os_tenant_name, os_tenant_name=auth_config.os_tenant_name,
os_password=auth_config.os_password, os_password=auth_config.os_password,
os_username=auth_config.os_username, os_username=auth_config.os_username,

3
ceilometer/central/manager.py
View File

@ -72,7 +72,8 @@ class AgentManager(agent.AgentManager):
tenant_id=cfg.CONF.service_credentials.os_tenant_id, tenant_id=cfg.CONF.service_credentials.os_tenant_id,
tenant_name=cfg.CONF.service_credentials.os_tenant_name, tenant_name=cfg.CONF.service_credentials.os_tenant_name,
cacert=cfg.CONF.service_credentials.os_cacert, cacert=cfg.CONF.service_credentials.os_cacert,
auth_url=cfg.CONF.service_credentials.os_auth_url) auth_url=cfg.CONF.service_credentials.os_auth_url,
region_name=cfg.CONF.service_credentials.os_region_name)
super(AgentManager, self).interval_task(task) super(AgentManager, self).interval_task(task)

1
ceilometer/nova_client.py
View File

@ -51,6 +51,7 @@ class Client(object):
api_key=conf.os_password, api_key=conf.os_password,
project_id=tenant, project_id=tenant,
auth_url=conf.os_auth_url, auth_url=conf.os_auth_url,
region_name=conf.os_region_name,
endpoint_type=conf.os_endpoint_type, endpoint_type=conf.os_endpoint_type,
cacert=conf.os_cacert, cacert=conf.os_cacert,
no_cache=True) no_cache=True)

4
ceilometer/service.py
View File

@ -65,6 +65,10 @@ CLI_OPTIONS = [
default=os.environ.get('OS_AUTH_URL', default=os.environ.get('OS_AUTH_URL',
'http://localhost:5000/v2.0'), 'http://localhost:5000/v2.0'),
help='Auth URL to use for openstack service access'), help='Auth URL to use for openstack service access'),
cfg.StrOpt('os-region-name',
deprecated_group="DEFAULT",
default=os.environ.get('OS_REGION_NAME', None),
help='Region name to use for openstack service endpoints'),
cfg.StrOpt('os-endpoint-type', cfg.StrOpt('os-endpoint-type',
default=os.environ.get('OS_ENDPOINT_TYPE', 'publicURL'), default=os.environ.get('OS_ENDPOINT_TYPE', 'publicURL'),
help='Type of endpoint in Identity service catalog to use for ' help='Type of endpoint in Identity service catalog to use for '

4
etc/ceilometer/ceilometer.conf.sample
View File

@ -679,6 +679,10 @@
# Auth URL to use for openstack service access (string value) # Auth URL to use for openstack service access (string value)
#os_auth_url=http://localhost:5000/v2.0 #os_auth_url=http://localhost:5000/v2.0
# Region name to use for openstack service endpoints (string
# value)
#os_region_name=<None>
# Type of endpoint in Identity service catalog to use for # Type of endpoint in Identity service catalog to use for
# communication with OpenStack services. (string value) # communication with OpenStack services. (string value)
#os_endpoint_type=publicURL #os_endpoint_type=publicURL