From 72fb7f84c167c82be0becb4fee0cb653d9415aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Starck?=
 <gregory.starck@savoirfairelinux.com>
Date: Fri, 16 Jan 2015 17:23:14 -0500
Subject: [PATCH] Add: completed keystone pack

Change-Id: I38ce92f0eb5c8d174ab1810903102acde6eeddba
---
 .../packs/linux-keystone/pack/commands.cfg        |  6 +++---
 .../packs/linux-keystone/pack/linux-keystone.pack | 13 ++++++++-----
 .../linux-keystone/pack/services/keystone.cfg     |  7 +++++++
 .../linux-keystone/pack/services/service1.cfg     |  7 -------
 .../packs/linux-keystone/pack/templates.cfg       | 15 +++++++--------
 5 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 shinken-tools/packs/linux-keystone/pack/services/keystone.cfg
 delete mode 100644 shinken-tools/packs/linux-keystone/pack/services/service1.cfg

diff --git a/shinken-tools/packs/linux-keystone/pack/commands.cfg b/shinken-tools/packs/linux-keystone/pack/commands.cfg
index cc34af4..6e68ae2 100644
--- a/shinken-tools/packs/linux-keystone/pack/commands.cfg
+++ b/shinken-tools/packs/linux-keystone/pack/commands.cfg
@@ -5,6 +5,6 @@
 # -----------------------------------------------------------------
 
 define command {
-                command_name                          CHECK_KEYSTONE
-                command_line                          $PLUGINSDIR$/check_keystone -H $HOSTADDRESS$ $OPTIONS$
-}
\ No newline at end of file
+    command_name    check_keystone
+    command_line    $PLUGINSDIR$/check_keystone -U $_HOSTOS_AUTH_URL$ -u $_HOSTOS_USERNAME$ -p $_HOSTOS_PASSOWRD$ -t $_HOSTOS_TENANT_NAME$ -s $_HOSTKS_SERVICES$
+}
diff --git a/shinken-tools/packs/linux-keystone/pack/linux-keystone.pack b/shinken-tools/packs/linux-keystone/pack/linux-keystone.pack
index 773661e..ee3741b 100644
--- a/shinken-tools/packs/linux-keystone/pack/linux-keystone.pack
+++ b/shinken-tools/packs/linux-keystone/pack/linux-keystone.pack
@@ -6,16 +6,19 @@
 "path":"",
 
 "macros":{
-        "_AUTH_URL": {"type": "url",
+        "_OS_AUTH_URL": {"type": "url",
                      "description": "Auth URL"
                     },
-        "_USERNAME": {"type": "string",
+        "_OS_USERNAME": {"type": "string",
                      "description": "OpenStack username"
                     },
-        "_PASSWORD": {"type": "string",
+        "_OS_PASSWORD": {"type": "string",
                      "description": "OpenStack password"
                     },
-        "_TENANT": {"type": "string",
+        "_OS_TENANT": {"type": "string",
                      "description": "OpenStack tenant name"
                     },
-}
\ No newline at end of file
+        "_KS_SERVICES": {"type": "string",
+                     "description": "Keystone services to expect"
+                    },
+}
diff --git a/shinken-tools/packs/linux-keystone/pack/services/keystone.cfg b/shinken-tools/packs/linux-keystone/pack/services/keystone.cfg
new file mode 100644
index 0000000..65ae2f1
--- /dev/null
+++ b/shinken-tools/packs/linux-keystone/pack/services/keystone.cfg
@@ -0,0 +1,7 @@
+define service{
+   host_name	  	        linux-keystone
+   service_description      Check KeyStone service.
+   use            	        generic-service
+   register       	        0
+   check_command            check_keystone
+}
diff --git a/shinken-tools/packs/linux-keystone/pack/services/service1.cfg b/shinken-tools/packs/linux-keystone/pack/services/service1.cfg
deleted file mode 100644
index 9fde895..0000000
--- a/shinken-tools/packs/linux-keystone/pack/services/service1.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-define service{
-   host_name	  	        linux-keystone
-   service_description      service1.cfg
-   use            	        linux-keystone-service
-   register       	        0
-   check_command            CHECK_KEYSTONE
-}
\ No newline at end of file
diff --git a/shinken-tools/packs/linux-keystone/pack/templates.cfg b/shinken-tools/packs/linux-keystone/pack/templates.cfg
index 06aeb95..3afe021 100644
--- a/shinken-tools/packs/linux-keystone/pack/templates.cfg
+++ b/shinken-tools/packs/linux-keystone/pack/templates.cfg
@@ -1,14 +1,13 @@
 # Shinken pack for monitoring OpenStack Keystone
 define host{
    name                 linux-keystone
-   use                  pack-generic-host
+   use                  generic-host
    check_interval       1
    register             0
-}
 
-define service{
-    use                             pack-generic-host-service
-    service-description             linux-keystone-service
-    name                            linux-keystone-service
-    register                        0
-}
\ No newline at end of file
+   _OS_AUTH_URL    null
+    _OS_USERNAME    null
+    _OS_PASSOWRD    null
+    _OS_TENANT_NAME null
+    _KS_SERVICES    identity
+}