openstack/aodh
Code Issues Proposed changes

Add support for CA authentication in Keystone

Browse Source 
Change-Id: Ida2240b5217509cbd4116b4d468848760354be18
Fixes: bug #1194046
This commit is contained in:
Julien Danjou 2013-07-24 12:26:15 +02:00
parent f6e8b8a613
commit ede3cc0a70
6 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceilometer/alarm/service.py
View File

@ -83,6 +83,7 @@ class SingletonAlarmService(os_service.Service):
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,
cacert=auth_config.os_cacert,
endpoint_type=auth_config.os_endpoint_type, endpoint_type=auth_config.os_endpoint_type,
) )
return ceiloclient.get_client(2, **creds) return ceiloclient.get_client(2, **creds)

1
ceilometer/alarm/threshold_evaluation.py
View File

@ -72,6 +72,7 @@ class Evaluator(object):
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,
cacert=auth_config.os_cacert,
endpoint_type=auth_config.os_endpoint_type, endpoint_type=auth_config.os_endpoint_type,
) )
self.api_client = ceiloclient.get_client(2, **creds) self.api_client = ceiloclient.get_client(2, **creds)

1
ceilometer/central/manager.py
View File

@ -71,6 +71,7 @@ class AgentManager(agent.AgentManager):
password=cfg.CONF.service_credentials.os_password, password=cfg.CONF.service_credentials.os_password,
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,
auth_url=cfg.CONF.service_credentials.os_auth_url) auth_url=cfg.CONF.service_credentials.os_auth_url)
super(AgentManager, self).interval_task(task) super(AgentManager, self).interval_task(task)

1
ceilometer/nova_client.py
View File

@ -52,6 +52,7 @@ class Client(object):
project_id=tenant, project_id=tenant,
auth_url=cfg.CONF.service_credentials.os_auth_url, auth_url=cfg.CONF.service_credentials.os_auth_url,
endpoint_type=cfg.CONF.service_credentials.os_endpoint_type, endpoint_type=cfg.CONF.service_credentials.os_endpoint_type,
cacert=cfg.CONF.service_credentials.os_cacert,
no_cache=True) no_cache=True)
def _with_flavor_and_image(self, instances): def _with_flavor_and_image(self, instances):

3
ceilometer/service.py
View File

@ -57,6 +57,9 @@ CLI_OPTIONS = [
deprecated_group="DEFAULT", deprecated_group="DEFAULT",
default=os.environ.get('OS_TENANT_NAME', 'admin'), default=os.environ.get('OS_TENANT_NAME', 'admin'),
help='Tenant name to use for openstack service access'), help='Tenant name to use for openstack service access'),
cfg.StrOpt('os-cacert',
default=os.environ.get('OS_CACERT', None),
help='Certificate chain for SSL validation'),
cfg.StrOpt('os-auth-url', cfg.StrOpt('os-auth-url',
deprecated_group="DEFAULT", deprecated_group="DEFAULT",
default=os.environ.get('OS_AUTH_URL', default=os.environ.get('OS_AUTH_URL',

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

@ -639,6 +639,9 @@
# value) # value)
#os_tenant_name=admin #os_tenant_name=admin
# Certificate chain for SSL validation (string value)
#os_cacert=<None>
# 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