From e9011e8d9b604abc3cdaeab91b06b149441f36b9 Mon Sep 17 00:00:00 2001 From: aviau Date: Wed, 17 Jun 2015 16:05:59 -0400 Subject: [PATCH] Fixed pack names Change-Id: I60625e7e8341c3944bb6a5283dea88b0a4641353 --- etc/surveil/surveil_os_interface.cfg | 2 +- surveil/cmd/init.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/surveil/surveil_os_interface.cfg b/etc/surveil/surveil_os_interface.cfg index 87d80fa..438ebe8 100644 --- a/etc/surveil/surveil_os_interface.cfg +++ b/etc/surveil/surveil_os_interface.cfg @@ -6,7 +6,7 @@ SURVEIL_OS_AUTH_URL=http://localhost/v2.0 SURVEIL_OS_USERNAME=admin SURVEIL_OS_PASSWORD=password SURVEIL_OS_TENANT_NAME=admin -SURVEIL_DEFAULT_TAGS=linux-openstackceilometer +SURVEIL_DEFAULT_TAGS=openstack-host SURVEIL_NETWORK_LABEL=surveil RABBIT_HOST=192.168.49.239 RABBIT_PORT=5672 diff --git a/surveil/cmd/init.py b/surveil/cmd/init.py index c13db7c..39068a7 100644 --- a/surveil/cmd/init.py +++ b/surveil/cmd/init.py @@ -142,7 +142,7 @@ def main(): # Linux-keystone template cli_surveil.config.hosts.create( host_name='test_keystone', - use='linux-keystone', + use='openstack-keystone-http', address='127.0.0.1', custom_fields={ "_OS_AUTH_URL": "bla", @@ -154,10 +154,10 @@ def main(): } ) - # Linux-openstackceilometer template + # openstack-host template cli_surveil.config.hosts.create( host_name='openstackceilometer-host', - use='linux-openstackceilometer', + use='openstack-host', address='127.0.0.1', custom_fields={ "_OS_AUTH_URL": "bla",