sync helpers

hooks/charmhelpers/contrib/hahelpers/cluster.py

@@ -126,17 +126,17 @@ def determine_api_port(public_port):
     return public_port - (i * 10)
 
 
-def determine_apache_port(public_port):
+def determine_haproxy_port(public_port):
     '''
-    Description: Determine correct apache listening port based on public IP +
-    state of the cluster.
+    Description: Determine correct proxy listening port based on public IP +
+    existence of HTTPS reverse proxy.
 
     public_port: int: standard public port for given service
 
     returns: int: the correct listening port for the HAProxy service
     '''
     i = 0
-    if len(peer_units()) > 0 or is_clustered():
+    if https():
         i += 1
     return public_port - (i * 10)
 

hooks/charmhelpers/contrib/openstack/context.py

@@ -27,9 +27,11 @@ from charmhelpers.core.hookenv import (
 )
 
 from charmhelpers.contrib.hahelpers.cluster import (
-    determine_apache_port,
     determine_api_port,
+    determine_haproxy_port,
     https,
+    is_clustered,
+    peer_units,
 )
 
 from charmhelpers.contrib.hahelpers.apache import (
@@ -263,12 +265,7 @@ class AMQPContext(OSContextGenerator):
                     # Sufficient information found = break out!
                     break
             # Used for active/active rabbitmq >= grizzly
-            if ('clustered' not in ctxt or relation_get('ha-vip-only') == 'True') and \
-               len(related_units(rid)) > 1:
-                if relation_get('ha_queues'):
-                    ctxt['rabbitmq_ha_queues'] = relation_get('ha_queues')
-                else:
-                    ctxt['rabbitmq_ha_queues'] = False
+            if 'clustered' not in ctxt and len(related_units(rid)) > 1:
                 rabbitmq_hosts = []
                 for unit in related_units(rid):
                     rabbitmq_hosts.append(relation_get('private-address',
@@ -297,13 +294,11 @@ class CephContext(OSContextGenerator):
                                               unit=unit))
                 auth = relation_get('auth', rid=rid, unit=unit)
                 key = relation_get('key', rid=rid, unit=unit)
-                use_syslog = str(config('use-syslog')).lower()
 
         ctxt = {
             'mon_hosts': ' '.join(mon_hosts),
             'auth': auth,
             'key': key,
-            'use_syslog': use_syslog
         }
 
         if not os.path.isdir('/etc/ceph'):
@@ -432,9 +427,11 @@ class ApacheSSLContext(OSContextGenerator):
             'private_address': unit_get('private-address'),
             'endpoints': []
         }
-        for api_port in self.external_ports:
-            ext_port = determine_apache_port(api_port)
-            int_port = determine_api_port(api_port)
+        for ext_port in self.external_ports:
+            if peer_units() or is_clustered():
+                int_port = determine_haproxy_port(ext_port)
+            else:
+                int_port = determine_api_port(ext_port)
             portmap = (int(ext_port), int(int_port))
             ctxt['endpoints'].append(portmap)
         return ctxt
@@ -636,7 +633,6 @@ class SubordinateConfigContext(OSContextGenerator):
 
 
 class SyslogContext(OSContextGenerator):
-
     def __call__(self):
         ctxt = {
             'use_syslog': config('use-syslog')

hooks/charmhelpers/contrib/storage/linux/ceph.py

@@ -49,9 +49,6 @@ CEPH_CONF = """[global]
  auth supported = {auth}
  keyring = {keyring}
  mon host = {mon_hosts}
- log to syslog = {use_syslog}
- err to syslog = {use_syslog}
- clog to syslog = {use_syslog}
 """
 
 
@@ -197,7 +194,7 @@ def get_ceph_nodes():
     return hosts
 
 
-def configure(service, key, auth, use_syslog):
+def configure(service, key, auth):
     ''' Perform basic configuration of Ceph '''
     create_keyring(service, key)
     create_key_file(service, key)
@@ -205,8 +202,7 @@ def configure(service, key, auth, use_syslog):
     with open('/etc/ceph/ceph.conf', 'w') as ceph_conf:
         ceph_conf.write(CEPH_CONF.format(auth=auth,
                                          keyring=_keyring_path(service),
-                                         mon_hosts=",".join(map(str, hosts)),
-                                         use_syslog=use_syslog))
+                                         mon_hosts=",".join(map(str, hosts))))
     modprobe('rbd')
 
 

hooks/charmhelpers/core/host.py

@@ -194,7 +194,7 @@ def file_hash(path):
         return None
 
 
-def restart_on_change(restart_map, stopstart=False):
+def restart_on_change(restart_map):
     """Restart services based on configuration files changing
 
     This function is used a decorator, for example
@@ -219,14 +219,8 @@ def restart_on_change(restart_map, stopstart=False):
             for path in restart_map:
                 if checksums[path] != file_hash(path):
                     restarts += restart_map[path]
-            services_list = list(OrderedDict.fromkeys(restarts))
-            if not stopstart:
-                for service_name in services_list:
-                    service('restart', service_name)
-            else:
-                for action in ['stop', 'start']:
-                    for service_name in services_list:
-                        service(action, service_name)
+            for service_name in list(OrderedDict.fromkeys(restarts)):
+                service('restart', service_name)
         return wrapped_f
     return wrap