- keystone = {}
- keystone['username']=env['OS_USERNAME']
- keystone['password']=env['OS_PASSWORD']
- keystone['auth_url']=env['OS_AUTH_URL']
- keystone['tenant_name']=env['OS_TENANT_NAME']
-
- ceilometer_client = client._get_ksclient(**keystone)
- token = ceilometer_client.auth_token
-
- ceilo_endpoint = client._get_endpoint(ceilometer_client, **keystone)
-
- ceilometer = client.Client('2',endpoint = ceilo_endpoint, token = lambda: token)
-
+ keystone={}
+ keystone['os_username']=env['OS_USERNAME']
+ keystone['os_password']=env['OS_PASSWORD']
+ keystone['os_auth_url']=env['OS_AUTH_URL']
+ keystone['os_tenant_name']=env['OS_TENANT_NAME']
+ keystone['os_cacert']=env['OS_CACERT']
+ keystone['os_region_name']=env['OS_REGION_NAME']
+
+ keystone['username']=env['OS_USERNAME']
+ keystone['password']=env['OS_PASSWORD']
+ keystone['auth_url']=env['OS_AUTH_URL']
+ keystone['tenant_name']=env['OS_TENANT_NAME']
+ keystone['cacert']=env['OS_CACERT']
+ keystone['region_name']=env['OS_REGION_NAME']
+
+ keystone['auth_plugin']=client.AuthPlugin(**keystone)
+
+ ceilometer = client.get_client(2,**keystone)
+