Merge lp:~hloeung/charms/trusty/apache2/open-the-ports-please into lp:charms/trusty/apache2

[Haw Loeung]

As seen on a production service:

| apache2/0 unknown idle 1.25.6 1 80/tcp 162.213.33.139

Digging into it, it seems that ports.yaml had stale/incorrect information on what ports are open. We should just call open_ports to ensure all are open.

Here's what I did to figure it out and fix it. Excuse my print statements hehe.

Modified:

def ensure_ports(ports):
    """Ensure that only the desired ports are open."""
    print("here {}".format(ports))
    open_ports = set(get_open_ports())
    print("here open {}".format(open_ports))
    ports = set(ports)
    wanted_closed = ports.difference(open_ports)
    print("here closed {}".format(wanted_closed))
    for port in sorted(wanted_closed):
        print("here opening {}".format(port))
        open_port(port)
    unwanted_open = open_ports.difference(ports)
    print("here unwanted {}".format(unwanted_open))
    for port in sorted(unwanted_open):
        print("here closing {}".format(port))
        close_port(port)
    set_open_ports(list(sorted(ports)))

2016-09-22 06:12:02 INFO config-changed here set([80, 443])
2016-09-22 06:12:02 INFO config-changed here open set([80, 443])
2016-09-22 06:12:02 INFO config-changed here closed set([])
2016-09-22 06:12:02 INFO config-changed here unwanted set([])

Deleted ports.yaml:

2016-09-22 06:19:00 INFO config-changed here set([80, 443])
2016-09-22 06:19:00 INFO config-changed here open set([])
2016-09-22 06:19:00 INFO config-changed here closed set([80, 443])
2016-09-22 06:19:00 INFO config-changed here opening 80
2016-09-22 06:19:00 INFO config-changed here opening 443
2016-09-22 06:19:00 INFO config-changed here unwanted set([])

From juju status:

| apache2/0 unknown idle 1.25.6 1 80/tcp,443/tcp 162.213.33.139

[Robert Bruce Park (robru)]

lgtm

review: Approve

[Stuart Bishop (stub)]

Yup

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-02-25 20:46:58 +0000
+++ hooks/hooks.py	2016-09-22 06:29:17 +0000
@@ -957,12 +957,11 @@
     """Ensure that only the desired ports are open."""
     open_ports = set(get_open_ports())
     ports = set(ports)
-    wanted_closed = ports.difference(open_ports)
-    for port in sorted(wanted_closed):
-        open_port(port)
     unwanted_open = open_ports.difference(ports)
     for port in sorted(unwanted_open):
         close_port(port)
+    for port in ports:
+        open_port(port)
     set_open_ports(list(sorted(ports)))