First go on rearranging haproxy and apache. Needs some refactoring.

hooks/charmhelpers/contrib/hahelpers/cluster.py

@@ -126,6 +126,13 @@ def determine_api_port(public_port):
     return public_port - (i * 10)
 
 
+def determine_apache_port(public_port):
+    i = 0
+    if len(peer_units()) > 0 or is_clustered():
+        i += 1
+    return public_port - (i * 10)
+
+
 def determine_haproxy_port(public_port):
     '''
     Description: Determine correct proxy listening port based on public IP +
@@ -136,8 +143,6 @@ def determine_haproxy_port(public_port):
     returns: int: the correct listening port for the HAProxy service
     '''
     i = 0
-    if https():
-        i += 1
     return public_port - (i * 10)