Merge pull request #5 from docker/staging

dockercloud-haproxy 1.1

Author: Feng Honglin

.gitignore

@@ -8,6 +8,7 @@ output
 
 # Packages
 *.egg
+*.eggs
 *.egg-info
 dist
 build
@@ -38,3 +39,4 @@ nosetests.xml
 .project
 .pydevproject
 .idea
+.DS_Store

Dockerfile

@@ -27,6 +27,5 @@ ENV RSYSLOG_DESTINATION=127.0.0.1 \
     SSL_BIND_CIPHERS="ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:DHE-DSS-AES128-SHA:DES-CBC3-SHA" \
     HEALTH_CHECK="check"
 
-
 EXPOSE 80 443 1936
 CMD ["dockercloud-haproxy"]

README.md

@@ -43,7 +43,7 @@ Settings in this part is immutable, you have to redeploy HAProxy service to make
 |env var|default|description|
 |:-----:|:-----:|:----------|
 |DEFAULT_SSL_CERT||Default ssl cert, a pem file content with private key followed by public certificate, '\n'(two chars) as the line separator. should be formatted as one line - see [SSL Termination](#ssl-termination)|
-|EXTRA_SSL_CERTS||List of extra certificate names separated by space, eg. `CERT1 CERT2 CERT3`. You also need to specify each certifcate as separate env variables like so: `CERT1="<cert-body1>"`, `CERT2="<cert-body2>"`, `CERT3="<cert-body3>"`|
+|EXTRA_SSL_CERTS||List of extra certificate names separated by comma, eg. `CERT1, CERT2, CERT3`. You also need to specify each certifcate as separate env variables like so: `CERT1="<cert-body1>"`, `CERT2="<cert-body2>"`, `CERT3="<cert-body3>"`|
 |BALANCE|roundrobin|load balancing algorithm to use. Possible values include: `roundrobin`, `static-rr`, `source`, `leastconn`. See:[HAProxy:balance](https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#4-balance)|
 |MODE|http|mode of load balancing for HAProxy. Possible values include: `http`, `tcp`, `health`|
 |MAXCONN|4096|sets the maximum per-process number of concurrent connections.|
@@ -57,7 +57,7 @@ Settings in this part is immutable, you have to redeploy HAProxy service to make
 |HEALTH_CHECK|check|set health check on each backend route, possible value: "check inter 2000 rise 2 fall 3". See:[HAProxy:check](https://cbonte.github.io/haproxy-dconv/configuration-1.5.html#5.2-check)|
 |EXTRA_GLOBAL_SETTINGS|<empty>|comma-separated string of extra settings, and each part will be appended to GLOBAL section in the configuration file. To escape comma, use `\,`. Possible value: `tune.ssl.cachesize 20000, tune.ssl.default-dh-param 2048`|
 |EXTRA_DEFAULT_SETTINGS|<empty>|comma-separated string of extra settings, and each part will be appended to DEFAULT section in the configuration file. To escape comma, use `\,`|
-|EXTRA_BIND_SETTINGS|<empty>|comma-separated string(<port>:<setting>) of extra settings, and each part will be appended to the related port bind section in the configuration file. To escape comma, use `\,`. Possible vaule: `443:accept-proxy, 80:name http`|
+|EXTRA_BIND_SETTINGS|<empty>|comma-separated string(`<port>:<setting>`) of extra settings, and each part will be appended to the related port bind section in the configuration file. To escape comma, use `\,`. Possible vaule: `443:accept-proxy, 80:name http`|
 |HTTP_BASIC_AUTH|<empty>|a comma-separated list of credentials(`<user>:<pass>`) for HTTP basic auth, which applies to all the backend routes. To escape comma, use `\,`. *Attention:* DO NOT rely on this for authentication in production|
 |CA_CERT|<empty>|CA cert for haproxy to verify the client. Use the same format as `DEFAULT_SSL_CERT`|
 |MONITOR_PORT|<empty>|the port number where monitor_uri should be added to. Use together with `MONTIOR_URI`. Possible value: `80`|

haproxy/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.1"
+__version__ = "1.1"

haproxy/config.py

@@ -0,0 +1,45 @@
+import os
+import re
+
+from parser import parse_extra_bind_settings
+
+# envvar
+DEFAULT_SSL_CERT = os.getenv("DEFAULT_SSL_CERT") or os.getenv("SSL_CERT")
+EXTRA_SSL_CERT = os.getenv("EXTRA_SSL_CERTS")
+DEFAULT_CA_CERT = os.getenv("CA_CERT")
+MAXCONN = os.getenv("MAXCONN", "4096")
+MODE = os.getenv("MODE", "http")
+OPTION = os.getenv("OPTION", "redispatch, httplog, dontlognull, forwardfor")
+RSYSLOG_DESTINATION = os.getenv("RSYSLOG_DESTINATION", "127.0.0.1")
+SSL_BIND_CIPHERS = os.getenv("SSL_BIND_CIPHERS")
+SSL_BIND_OPTIONS = os.getenv("SSL_BIND_OPTIONS")
+STATS_AUTH = os.getenv("STATS_AUTH", "stats:stats")
+STATS_PORT = os.getenv("STATS_PORT", "1936")
+TIMEOUT = os.getenv("TIMEOUT", "connect 5000, client 50000, server 50000")
+HEALTH_CHECK = os.getenv("HEALTH_CHECK", "check inter 2000 rise 2 fall 3")
+EXTRA_GLOBAL_SETTINGS = os.getenv("EXTRA_GLOBAL_SETTINGS")
+EXTRA_DEFAULT_SETTINGS = os.getenv("EXTRA_DEFAULT_SETTINGS")
+EXTRA_BIND_SETTINGS = parse_extra_bind_settings(os.getenv("EXTRA_BIND_SETTINGS"))
+HTTP_BASIC_AUTH = os.getenv("HTTP_BASIC_AUTH")
+MONITOR_URI = os.getenv("MONITOR_URI")
+MONITOR_PORT = os.getenv("MONITOR_PORT")
+BALANCE = os.getenv("BALANCE", "roundrobin")
+HAPROXY_CONTAINER_URI = os.getenv("DOCKERCLOUD_CONTAINER_API_URI")
+HAPROXY_SERVICE_URI = os.getenv("DOCKERCLOUD_SERVICE_API_URI")
+API_AUTH = os.getenv("DOCKERCLOUD_AUTH")
+DEBUG = os.getenv("DEBUG", False)
+
+# const
+CERT_DIR = "/certs/"
+CACERT_DIR = "/cacerts/"
+HAPROXY_CONFIG_FILE = "/haproxy.cfg"
+HAPROXY_RUN_COMMAND = ['/usr/sbin/haproxy', '-f', HAPROXY_CONFIG_FILE, '-db', '-q']
+API_RETRY = 10  # seconds
+PID_FILE = "/tmp/dockercloud-haproxy.pid"
+
+SERVICE_NAME_MATCH = re.compile(r"(.+)_\d+$")
+BACKEND_MATCH = re.compile(r"(?P<proto>tcp|udp):\/\/(?P<addr>[^:]*):(?P<port>.*)")
+SERVICE_ALIAS_MATCH = re.compile(r"_PORT_\d{1,5}_(TCP|UDP)$")
+DETAILED_SERVICE_ALIAS_MATCH = re.compile(r"_\d+_PORT_\d{1,5}_(TCP|UDP)$")
+ENV_SERVICE_ALIAS_MATCH = re.compile(r"_ENV_")
+ENV_DETAILED_SERVICE_ALIAS_MATCH = re.compile(r"_\d+_ENV")

haproxy/eventhandler.py

@@ -0,0 +1,36 @@
+import logging
+
+import config
+from haproxycfg import run_haproxy, Haproxy
+from utils import get_uuid_from_resource_uri
+
+logger = logging.getLogger("haproxy")
+
+
+def on_cloud_event(event):
+    logger.debug(event)
+    logger.debug(Haproxy.cls_linked_services)
+    # When service scale up/down or container start/stop/terminate/redeploy, reload the service
+    if event.get("state", "") not in ["In progress", "Pending", "Terminating", "Starting", "Scaling", "Stopping"] and \
+                    event.get("type", "").lower() in ["container", "service"] and \
+                    len(set(Haproxy.cls_linked_services).intersection(set(event.get("parents", [])))) > 0:
+        msg = "Event: %s %s is %s" % (
+            event["type"], get_uuid_from_resource_uri(event.get("resource_uri", "")), event["state"].lower())
+        run_haproxy(msg)
+
+    # Add/remove services linked to haproxy
+    if event.get("state", "") == "Success" and config.HAPROXY_SERVICE_URI in event.get("parents", []):
+        run_haproxy("Event: New action is executed on the Haproxy container")
+
+
+def on_websocket_open():
+    Haproxy.LINKED_CONTAINER_CACHE.clear()
+    run_haproxy("Websocket open")
+
+
+def on_websocket_close():
+    logger.info("Websocket close")
+
+
+def on_user_reload(signum, frame):
+    run_haproxy("User reload")