From 73285470e345c5682a5c1b6013eb497f9080bb9e Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 9 Aug 2017 16:01:28 +0100 Subject: [PATCH] Add status check, configure worker multiplier correctly --- src/templates/gnocchi.conf | 3 +++ src/tests/basic_deployment.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/templates/gnocchi.conf b/src/templates/gnocchi.conf index d6e5a5c..fdbf54a 100644 --- a/src/templates/gnocchi.conf +++ b/src/templates/gnocchi.conf @@ -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 }} diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py index 706172e..a3238c5 100644 --- a/src/tests/basic_deployment.py +++ b/src/tests/basic_deployment.py @@ -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')