Merge "use tempest manager"
diff --git a/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml b/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml
index 3670925..8eac9d0 100644
--- a/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml
+++ b/ceilometer/tests/integration/gabbi/gabbits-live/autoscaling.yaml
@@ -1,6 +1,6 @@
defaults:
request_headers:
- x-auth-token: $ENVIRON['ADMIN_TOKEN']
+ x-auth-token: $ENVIRON['USER_TOKEN']
tests:
- name: list alarms none
diff --git a/ceilometer/tests/tempest/scenario/test_telemetry_integration.py b/ceilometer/tests/tempest/scenario/test_telemetry_integration.py
index cf1e2d3..87b17e3 100644
--- a/ceilometer/tests/tempest/scenario/test_telemetry_integration.py
+++ b/ceilometer/tests/tempest/scenario/test_telemetry_integration.py
@@ -76,12 +76,14 @@
return endpoints[0]['endpoints'][0][endpoint_type]
def _do_test(self, filename):
- auth = self.os_admin.auth_provider.get_auth()
+ admin_auth = self.os_admin.auth_provider.get_auth()
+ auth = self.os_primary.auth_provider.get_auth()
networks = self.os_primary.networks_client.list_networks(
**{'router:external': False, 'fields': 'id'})['networks']
os.environ.update({
- "ADMIN_TOKEN": auth[0],
+ "ADMIN_TOKEN": admin_auth[0],
+ "USER_TOKEN": auth[0],
"AODH_GRANULARITY": str(config.CONF.telemetry.alarm_granularity),
"AODH_SERVICE_URL": self._get_endpoint(auth, "alarming_plugin"),
"GNOCCHI_SERVICE_URL": self._get_endpoint(auth, "metric"),