summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamesh Nachimuthu <rnachimu@redhat.com>2014-04-29 14:19:25 +0530
committerSahina Bose <sabose@redhat.com>2014-04-30 05:42:53 -0700
commit6fa90e73ddeb2a5df1e6ab01837a249274928ff6 (patch)
tree978aa35bf69de0acede3ea4a8f5e853dc8b47c1d
parentc33ec5936f3ef9fffe9bafc01e08af5a18c46fa2 (diff)
autoconf: Use only brick path in brick service
Change the brick service description to "Brick Status - <brick-path>". Currently it is "Brick Status - <hostaddress>:<brick-path>". Same case for Brick utilization service also. Change-Id: I3924f15e3b8b86826c0019c5ab52bd371a970cf1 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com> Reviewed-on: http://review.gluster.org/7597 Reviewed-by: Sahina Bose <sabose@redhat.com>
-rw-r--r--config/glustercluster.cfg.sample24
-rw-r--r--plugins/config_generator.py6
-rw-r--r--tests/test_config_generator.py6
3 files changed, 18 insertions, 18 deletions
diff --git a/config/glustercluster.cfg.sample b/config/glustercluster.cfg.sample
index 191b6ee..adf823d 100644
--- a/config/glustercluster.cfg.sample
+++ b/config/glustercluster.cfg.sample
@@ -50,28 +50,32 @@ define host{
# This defines a Brick utilization service
# Edit this sample
# host_name = host the brick is on
-# service_description = brick name of form serverip:brickdir
+# service_description = Brick Utilization - <brickdir>
# _BRICK_DIR = Path to brick on server
+# _VOL_NAME = Volume name the brick is part of
################################################################################
define service {
- use brick-service
- host_name host.ipaddress1
- service_description Brick Utilization - host.ipaddress1:/bricks/b1
- _BRICK_DIR /bricks/b1 ; MUST DECLARE the custom var _BRICK_DIR
+ use brick-service
+ host_name host.ipaddress1
+ service_description Brick Utilization - /bricks/b1
+ _BRICK_DIR /bricks/b1 ; MUST DECLARE the custom var _BRICK_DIR
+ _VOL_NAME Vol-1
}
################################################################################
# This defines a Brick Status service
# Edit this sample
# host_name = host the brick is on
-# service_description = brick name of form serverip:brickdir
+# service_description = Brick Status - <brickdir>
# _BRICK_DIR = Path to brick on server
+# _VOL_NAME = Volume name the brick is part of
################################################################################
define service {
- use brick-passive-service
- host_name host.ipaddress1
- service_description Brick Status - host.ipaddress1:/bricks/b1
- _BRICK_DIR /bricks/b1 ; MUST DECLARE the custom var _BRICK_DIR
+ use brick-passive-service
+ host_name host.ipaddress1
+ service_description Brick Status - /bricks/b1
+ _BRICK_DIR /bricks/b1 ; MUST DECLARE the custom var _BRICK_DIR
+ _VOL_NAME Vol-1
}
################################################################################
diff --git a/plugins/config_generator.py b/plugins/config_generator.py
index f76279f..7e36ae0 100644
--- a/plugins/config_generator.py
+++ b/plugins/config_generator.py
@@ -149,8 +149,7 @@ class GlusterNagiosConfManager:
brickService = {}
brickService['use'] = 'brick-service'
brickService['host_name'] = hostName
- serviceDesc = "Brick Utilization - %s:%s" % (hostName,
- brick['brickpath'])
+ serviceDesc = "Brick Utilization - %s" % brick['brickpath']
brickService['service_description'] = serviceDesc
brickService['_BRICK_DIR'] = brick['brickpath']
brickService['_VOL_NAME'] = brick['volumeName']
@@ -161,8 +160,7 @@ class GlusterNagiosConfManager:
brickService = {}
brickService['use'] = 'gluster-brick-passive-service'
brickService['host_name'] = hostName
- serviceDesc = "Brick Status - %s:%s" % (hostName,
- brick['brickpath'])
+ serviceDesc = "Brick Status - %s" % brick['brickpath']
brickService['service_description'] = serviceDesc
brickService['_BRICK_DIR'] = brick['brickpath']
brickService['_VOL_NAME'] = brick['volumeName']
diff --git a/tests/test_config_generator.py b/tests/test_config_generator.py
index 8c79057..d8e8789 100644
--- a/tests/test_config_generator.py
+++ b/tests/test_config_generator.py
@@ -45,14 +45,12 @@ class TestGlusterNagiosConfManager(TestCaseBase):
def _verifyHostServices(self, hostConfig, hostData):
for brick in hostData['bricks']:
- serviceDesc = "Brick Status - %s:%s" % (hostData['hostname'],
- brick['brickpath'])
+ serviceDesc = "Brick Status - %s" % brick['brickpath']
service = self._findServiceInList(hostConfig['host_services'],
serviceDesc)
self.assertNotEqual(service, None,
"Brick status service is not created")
- serviceDesc = "Brick Utilization - %s:%s" % (hostData['hostname'],
- brick['brickpath'])
+ serviceDesc = "Brick Utilization - %s" % brick['brickpath']
service = self._findServiceInList(hostConfig['host_services'],
serviceDesc)
self.assertNotEqual(service, None,