Add status check, configure worker multiplier correctly
This commit is contained in:
parent
8372a3ed52
commit
73285470e3
|
@ -18,6 +18,9 @@ auth_mode = keystone
|
|||
url = {{ shared_db.uri }}
|
||||
{%- endif %}
|
||||
|
||||
[metricd]
|
||||
workers = {{ options.workers }}
|
||||
|
||||
[storage]
|
||||
{% if coordinator_memcached.url -%}
|
||||
coordination_url = {{ coordinator_memcached.url }}
|
||||
|
|
|
@ -123,6 +123,10 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
|||
tenant='admin')
|
||||
|
||||
# Authenticate admin with gnocchi endpoint
|
||||
gnocchi_ep = self.keystone.service_catalog.url_for(
|
||||
service_type='metric',
|
||||
interface='publicURL')
|
||||
|
||||
keystone_ep = self.keystone.service_catalog.url_for(
|
||||
service_type='identity',
|
||||
interface='publicURL')
|
||||
|
@ -132,7 +136,6 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
|||
sess = keystone_session.Session(auth=auth)
|
||||
self.gnocchi = gnocchi_client.Client(session=sess)
|
||||
|
||||
|
||||
def check_and_wait(self, check_command, interval=2, max_wait=200,
|
||||
desc=None):
|
||||
waited = 0
|
||||
|
@ -187,5 +190,5 @@ class GnocchiCharmDeployment(amulet_deployment.OpenStackAmuletDeployment):
|
|||
def test_200_api_connection(self):
|
||||
"""Simple api calls to check service is up and responding"""
|
||||
u.log.debug('Checking api functionality...')
|
||||
assert(self.gnocchi.status() != [])
|
||||
assert(self.gnocchi.status.get() != [])
|
||||
u.log.debug('OK')
|
||||
|
|
Loading…
Reference in New Issue