Merge lp:~jacekn/charms/precise/rabbitmq-server/fixes into lp:charms/rabbitmq-server

[Jacek Nykis]

This change allows rabbitmq-server charm to take advantage of "nagios_hostname" set in nrpe-external-master relation.

[Tim Van Steenburgh (tvansteenburgh)]

+1 LGTM, thanks Jacek!

If your charmhelpers changes would be generally useful, please consider also submitting them for merging into the charmhelpers project itself.

A Charmer will be along soon to merge your changes, thanks again!

review: Approve

[Jacek Nykis (jacekn)]

Thank you Tim.

The only charmhelpers change I made is to support hostname parameter, rest of them are just merged from upstream. There is already MP for the nagios hostname change waiting to be merged:
https://code.launchpad.net/~jacekn/charm-helpers/nrpe-hostname/+merge/218072

[Matt Bruzek (mbruzek)]

+1 LGTM

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-05-02 14:31:22 +0000
@@ -0,0 +1,1 @@
+revision

=== modified file 'hooks/charmhelpers/contrib/charmsupport/nrpe.py'
--- hooks/charmhelpers/contrib/charmsupport/nrpe.py	2014-03-05 12:57:20 +0000
+++ hooks/charmhelpers/contrib/charmsupport/nrpe.py	2014-05-02 14:31:22 +0000
@@ -179,12 +179,15 @@
     nagios_exportdir = '/var/lib/nagios/export'
     nrpe_confdir = '/etc/nagios/nrpe.d'
 
-    def __init__(self):
+    def __init__(self, hostname=None):
         super(NRPE, self).__init__()
         self.config = config()
         self.nagios_context = self.config['nagios_context']
         self.unit_name = local_unit().replace('/', '-')
-        self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
+        if hostname:
+            self.hostname = hostname
+        else:
+            self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
         self.checks = []
 
     def add_check(self, *args, **kwargs):

=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
--- hooks/charmhelpers/contrib/storage/linux/utils.py	2014-03-27 12:33:12 +0000
+++ hooks/charmhelpers/contrib/storage/linux/utils.py	2014-05-02 14:31:22 +0000
@@ -2,7 +2,9 @@
 from stat import S_ISBLK
 
 from subprocess import (
-    check_call
+    check_call,
+    check_output,
+    call
 )
 
 
@@ -22,5 +24,12 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
-    check_call(['sgdisk', '--zap-all', '--clear',
-                '--mbrtogpt', block_device])
+    # sometimes sgdisk exits non-zero; this is OK, dd will clean up
+    call(['sgdisk', '--zap-all', '--mbrtogpt',
+          '--clear', block_device])
+    dev_end = check_output(['blockdev', '--getsz', block_device])
+    gpt_end = int(dev_end.split()[0]) - 100
+    check_call(['dd', 'if=/dev/zero', 'of=%s'%(block_device),
+                'bs=1M', 'count=1'])
+    check_call(['dd', 'if=/dev/zero', 'of=%s'%(block_device),
+                'bs=512', 'count=100', 'seek=%s'%(gpt_end)])

=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2014-03-27 12:33:12 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2014-05-02 14:31:22 +0000
@@ -184,7 +184,7 @@
             apt.write(PROPOSED_POCKET.format(release))
     if key:
         subprocess.check_call(['apt-key', 'adv', '--keyserver',
-                               'keyserver.ubuntu.com', '--recv',
+                               'hkp://keyserver.ubuntu.com:80', '--recv',
                                key])
 
 

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2014-04-24 16:30:11 +0000
+++ hooks/rabbitmq_server_relations.py	2014-05-02 14:31:22 +0000
@@ -33,6 +33,7 @@
     related_units,
     service_name,
     local_unit,
+    relations_of_type,
     config,
     unit_get,
     is_relation_made,
@@ -360,6 +361,12 @@
                            'check_rabbitmq.py'),
               os.path.join(NAGIOS_PLUGINS, 'check_rabbitmq.py'))
 
+    # Find out if nrpe set nagios_hostname
+    hostname=None
+    for rel in relations_of_type('nrpe-external-master'):
+        if 'nagios_hostname' in rel:
+            hostname = rel['nagios_hostname']
+            break
     # create unique user and vhost for each unit
     current_unit = local_unit().replace('/', '-')
     user = 'nagios-%s' % current_unit
@@ -370,7 +377,7 @@
     rabbit.create_user(user, password)
     rabbit.grant_permissions(user, vhost)
 
-    nrpe_compat = NRPE()
+    nrpe_compat = NRPE(hostname=hostname)
     nrpe_compat.add_check(
         shortname=rabbit.RABBIT_USER,
         description='Check RabbitMQ',

=== modified file 'revision'
--- revision	2014-03-12 11:56:10 +0000
+++ revision	2014-05-02 14:31:22 +0000
@@ -1,1 +1,1 @@
-116
+128