Merge lp:~james-page/charm-helpers/haproxy-stats-1.6 into lp:charm-helpers

[James Page]

Fixup template for haproxy to support 1.6.

Tested with precise/icehouse as earlier haproxy we have in a supported release combo.

[James Page (james-page)]

Tested OK with precise/icehouse.

[lp:~james-page/charm-helpers/haproxy-stats-1.6]

515. By James Page on 2016-01-06

Bind stats to localhost only, ensure that random, persistent password is used for access

[Liam Young (gnuoy)]

approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2015-12-08 15:58:48 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-01-06 22:04:29 +0000
@@ -57,6 +57,7 @@
     get_nic_hwaddr,
     mkdir,
     write_file,
+    pwgen,
 )
 from charmhelpers.contrib.hahelpers.cluster import (
     determine_apache_port,
@@ -87,6 +88,8 @@
     is_bridge_member,
 )
 from charmhelpers.contrib.openstack.utils import get_host_ip
+from charmhelpers.core.unitdata import kv
+
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'
 ADDRESS_TYPES = ['admin', 'internal', 'public']
 
@@ -636,11 +639,18 @@
             ctxt['ipv6'] = True
             ctxt['local_host'] = 'ip6-localhost'
             ctxt['haproxy_host'] = '::'
-            ctxt['stat_port'] = ':::8888'
         else:
             ctxt['local_host'] = '127.0.0.1'
             ctxt['haproxy_host'] = '0.0.0.0'
-            ctxt['stat_port'] = ':8888'
+
+        ctxt['stat_port'] = '8888'
+
+        db = kv()
+        ctxt['stat_password'] = db.get('stat-password')
+        if not ctxt['stat_password']:
+            ctxt['stat_password'] = db.set('stat-password',
+                                           pwgen(32))
+            db.flush()
 
         for frontend in cluster_hosts:
             if (len(cluster_hosts[frontend]['backends']) > 1 or

=== modified file 'charmhelpers/contrib/openstack/templates/haproxy.cfg'
--- charmhelpers/contrib/openstack/templates/haproxy.cfg	2015-12-08 15:58:48 +0000
+++ charmhelpers/contrib/openstack/templates/haproxy.cfg	2016-01-06 22:04:29 +0000
@@ -33,13 +33,14 @@
     timeout server 30000
 {%- endif %}
 
-listen stats {{ stat_port }}
+listen stats
+    bind {{ local_host }}:{{ stat_port }}
     mode http
     stats enable
     stats hide-version
     stats realm Haproxy\ Statistics
     stats uri /
-    stats auth admin:password
+    stats auth admin:{{ stat_password }}
 
 {% if frontends -%}
 {% for service, ports in service_ports.items() -%}

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2015-11-19 17:33:29 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-01-06 22:04:29 +0000
@@ -476,6 +476,8 @@
     'get_host_ip',
     'charm_name',
     'sysctl_create',
+    'kv',
+    'pwgen',
 ]
 
 
@@ -498,6 +500,23 @@
         return self.relations[relation]
 
 
+class TestDB(object):
+    '''Test KV store for unitdata testing'''
+    def __init__(self):
+        self.data = {}
+        self.flushed = False
+
+    def get(self, key, default=None):
+        return self.data.get(key, default)
+
+    def set(self, key, value):
+        self.data[key] = value
+        return value
+
+    def flush(self):
+        self.flushed = True
+
+
 class ContextTests(unittest.TestCase):
 
     def setUp(self):
@@ -509,6 +528,8 @@
         self.local_unit.return_value = 'localunit'
         self.format_ipv6_addr.return_value = None
         self.get_host_ip.side_effect = lambda hostname: hostname
+        self.kv.side_effect = TestDB
+        self.pwgen.return_value = 'testpassword'
 
     def _patch(self, method):
         _m = patch('charmhelpers.contrib.openstack.context.' + method)
@@ -1293,7 +1314,8 @@
             'default_backend': 'cluster-peer0.localnet',
             'local_host': '127.0.0.1',
             'haproxy_host': '0.0.0.0',
-            'stat_port': ':8888',
+            'stat_password': 'testpassword',
+            'stat_port': '8888',
         }
         # the context gets generated.
         self.assertEquals(ex, result)
@@ -1345,7 +1367,8 @@
             'default_backend': 'cluster-peer0.localnet',
             'local_host': '127.0.0.1',
             'haproxy_host': '0.0.0.0',
-            'stat_port': ':8888',
+            'stat_password': 'testpassword',
+            'stat_port': '8888',
             'haproxy_client_timeout': 50000,
             'haproxy_server_timeout': 50000,
         }
@@ -1430,7 +1453,8 @@
             'default_backend': 'cluster-peer0.localnet',
             'local_host': '127.0.0.1',
             'haproxy_host': '0.0.0.0',
-            'stat_port': ':8888',
+            'stat_password': 'testpassword',
+            'stat_port': '8888',
         }
         # the context gets generated.
         self.assertEquals(ex, result)
@@ -1487,7 +1511,8 @@
             'haproxy_server_timeout': 50000,
             'haproxy_client_timeout': 50000,
             'haproxy_host': '::',
-            'stat_port': ':::8888',
+            'stat_password': 'testpassword',
+            'stat_port': '8888',
             'ipv6': True
         }
         # the context gets generated.
@@ -1561,7 +1586,8 @@
             'default_backend': 'lonely.clusterpeer.howsad',
             'haproxy_host': '0.0.0.0',
             'local_host': '127.0.0.1',
-            'stat_port': ':8888'
+            'stat_port': '8888',
+            'stat_password': 'testpassword',
         }
         self.assertEquals(ex, result)
         # and /etc/default/haproxy is updated.