From e3361e10b958adeebafbe1d52e2bd659f51b007a Mon Sep 17 00:00:00 2001 From: Tim Kuhlman Date: Mon, 20 Apr 2015 10:02:24 -0600 Subject: [PATCH] Collapsed the agent variables. Updated smoke test to the venv path. Change-Id: Ib2cb6b17196769fe1fe839fb4777de96d2cc3209 --- devstack.yml | 7 +++---- mini-mon.yml | 9 ++++----- tests/smoke.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/devstack.yml b/devstack.yml index 86eac61..f3f642d 100644 --- a/devstack.yml +++ b/devstack.yml @@ -2,10 +2,9 @@ sudo: yes vars: monasca_api_host: 192.168.10.4 - monasca_agent: - user: monasca-agent - password: password - project: mini-mon + monasca_agent_user: monasca-agent + monasca_agent_password: password + monasca_agent_project: mini-mon monasca_agent_check_frequency: 15 minimon: user: mini-mon diff --git a/mini-mon.yml b/mini-mon.yml index 2425ea4..4e1bbb4 100644 --- a/mini-mon.yml +++ b/mini-mon.yml @@ -42,11 +42,10 @@ kafka_replicas: 1 kafka_hosts: "{{mini_mon_host}}:9092" keystone_url: http://192.168.10.5:35357/v3 - monasca_agent: - user: monasca-agent - password: password - project: mini-mon - service: monitoring + monasca_agent_user: monasca-agent + monasca_agent_password: password + monasca_agent_project: mini-mon + monasca_agent_service: monitoring monasca_agent_check_frequency: 15 monasca_api_url: http://192.168.10.4:8080/v2.0 monasca_checks: diff --git a/tests/smoke.py b/tests/smoke.py index 4094365..6f81e68 100755 --- a/tests/smoke.py +++ b/tests/smoke.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/opt/monasca/bin/python # """smoke Runs a smoke test of the monitoring installation on mini-mon to ensure