Merge lp:~jamesj/charms/trusty/haproxy/xenial-support into lp:charms/trusty/haproxy

[James Jesudason]

Install python-apt for Xenial compatibility.
Included some initial fixes for Python3 compatibility.

Install python-apt for Xenial compatibility.
Included some initial fixes for Python3 compatibility.

[lp:~jamesj/charms/trusty/haproxy/xenial-support]

105. By James Jesudason on 2016-07-07

Change to the nagios check to handle versions > 1.5

[Cory Johns (johnsca)]

James,

Thanks for this contribution! It will be great to see the haproxy charm get support for Xenial.

This was missing a deploy test for Xenial, and I hit some errors while testing it. I created a MP against this proposed branch with a Xenial test, test fixes, and adding the series to the metadata: https://code.launchpad.net/~johnsca/charms/trusty/haproxy/xenial-support/+merge/299470 If that looks good to you, please merge it into your proposed branch and it will automatically update this MR.

I tried to (trivially) add support for Precise as well, but ran into an error: http://pastebin.ubuntu.com/18729639/ I didn't look any deeper into what the delta was between the Precise version of this charm and this one.

With those suggested fixes, I think this would be good. Because of the new process for promulgation, though, we will need one of the maintainers (Juan or Tom) to publish this charm into the store under their (or an appropriate group) namespace before we can move forward with merging and re-promulgation.

review: Needs Fixing

[lp:~jamesj/charms/trusty/haproxy/xenial-support]

106. By James Jesudason on 2016-07-08

Merge fixes to the tests

[James Jesudason (jamesj)]

> James,
>
> Thanks for this contribution! It will be great to see the haproxy charm get
> support for Xenial.
>
> This was missing a deploy test for Xenial, and I hit some errors while testing
> it. I created a MP against this proposed branch with a Xenial test, test
> fixes, and adding the series to the metadata:
> https://code.launchpad.net/~johnsca/charms/trusty/haproxy/xenial-
> support/+merge/299470 If that looks good to you, please merge it into your
> proposed branch and it will automatically update this MR.
>
Done - thanks for doing that

> I tried to (trivially) add support for Precise as well, but ran into an error:
> http://pastebin.ubuntu.com/18729639/ I didn't look any deeper into what the
> delta was between the Precise version of this charm and this one.
>
> With those suggested fixes, I think this would be good. Because of the new
> process for promulgation, though, we will need one of the maintainers (Juan or
> Tom) to publish this charm into the store under their (or an appropriate
> group) namespace before we can move forward with merging and re-promulgation.

At least, if we can get the change merged, it can be used from LP. Getting the update into the store would be great as we seem to be behind in getting Xenial support there for a number of projects.

[Cory Johns (johnsca)]

This has my +1 to merge, but due to this now being multi-series and the new conventions regarding hte charm store and storing charms in Launchpad, the repo will need to move from lp:charms/trusty/haproxy to be a top-level project at lp:charm-haproxy and the listed owner of the charm on jujucharms.com will need to change to either one of the maintainers or an appropriate team (e.g., haproxy-team, which would need to be created), as decided by the maintainers.

review: Approve

[James Jesudason (jamesj)]

> This has my +1 to merge, but due to this now being multi-series and the new
> conventions regarding hte charm store and storing charms in Launchpad, the
> repo will need to move from lp:charms/trusty/haproxy to be a top-level project
> at lp:charm-haproxy and the listed owner of the charm on jujucharms.com will
> need to change to either one of the maintainers or an appropriate team (e.g.,
> haproxy-team, which would need to be created), as decided by the maintainers.

Is there any chance that we can get the first step of merging this done? The renaming of the branch can happen later, when everyone is ready. I'm having to use my own fork for deployment at the moment.

[Charles Butler (lazypower)]

For the purposes of an Audit trail:

I've pushed the branch to lp:~charmers/charms/trusty/haproxy/trunk

When the repository potentially moves location, we will need to ensure we've updated the store entry. This is also incomplete, as we have only merged the requested branch review.

We still need to address and triage the points brought up in:

https://github.com/juju/docs/issues/1264

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5014/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4811/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5022/

review: Approve (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5030/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4818/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4823/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5037/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4827/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5041/

review: Approve (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4831/

review: Needs Fixing (automated testing)

=== modified file 'files/nrpe/check_haproxy.sh'
--- files/nrpe/check_haproxy.sh	2015-04-24 16:18:51 +0000
+++ files/nrpe/check_haproxy.sh	2016-07-08 08:37:32 +0000
@@ -13,7 +13,7 @@
 
 HAPROXY_VERSION="$(dpkg-query -W --showformat='${Version}\n' haproxy)"
 if dpkg --compare-versions "$HAPROXY_VERSION" ge 1.5; then
-    CLASS_REGEX='(active|backup)(3|4)'
+    CLASS_REGEX='(active_up|backup_up)'
 else
     CLASS_REGEX='(active|backup)(2|3)'
 fi

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-03-03 20:08:09 +0000
+++ hooks/hooks.py	2016-07-08 08:37:32 +0000
@@ -785,7 +785,7 @@
                 f.write(content)
 
         if not os.path.exists(default_haproxy_service_config_dir):
-            os.mkdir(default_haproxy_service_config_dir, 0600)
+            os.mkdir(default_haproxy_service_config_dir, 0o600)
         with open(os.path.join(default_haproxy_service_config_dir,
                                "%s.service" % service_name), 'w') as config:
             config.write(create_listen_stanza(
@@ -841,7 +841,7 @@
         if os.path.exists(path):
             try:
                 os.remove(path)
-            except Exception, e:
+            except Exception as e:
                 log(str(e))
                 return False
         return True
@@ -850,7 +850,7 @@
                                  default_haproxy_service_config_dir):
             try:
                 os.remove(service)
-            except Exception, e:
+            except Exception as e:
                 log(str(e))
                 pass
         return True
@@ -901,7 +901,7 @@
 def install_hook():
     # Run both during initial install and during upgrade-charm.
     if not os.path.exists(default_haproxy_service_config_dir):
-        os.mkdir(default_haproxy_service_config_dir, 0600)
+        os.mkdir(default_haproxy_service_config_dir, 0o600)
 
     config_data = config_get()
     source = config_data.get('source')
@@ -913,7 +913,9 @@
     apt_update(fatal=True)
     apt_install(['haproxy', 'python-jinja2'], fatal=True)
     # Install pyasn1 library and modules for inspecting SSL certificates
-    apt_install(['python-pyasn1', 'python-pyasn1-modules'], fatal=False)
+    apt_install(
+        ['python-pyasn1', 'python-pyasn1-modules', 'python-apt',
+         'python-openssl'], fatal=False)
     ensure_package_status(service_affecting_packages,
                           config_data['package_status'])
     enable_haproxy()
@@ -1349,7 +1351,7 @@
                        "statistics-relation-changed"):
         statistics_interface()
     else:
-        print "Unknown hook"
+        print("Unknown hook")
         sys.exit(1)
 
 if __name__ == "__main__":

=== modified file 'hooks/tests/test_install.py'
--- hooks/tests/test_install.py	2015-09-23 15:12:08 +0000
+++ hooks/tests/test_install.py	2016-07-08 08:37:32 +0000
@@ -48,7 +48,9 @@
         self.assertEqual((['haproxy', 'python-jinja2'],), calls[0][0])
         self.assertEqual({'fatal': True}, calls[0][1])
         self.assertEqual(
-            (['python-pyasn1', 'python-pyasn1-modules'],), calls[1][0])
+            (['python-pyasn1', 'python-pyasn1-modules', 'python-apt',
+              'python-openssl'],),
+            calls[1][0])
         self.assertEqual({'fatal': False}, calls[1][1])
 
     def test_add_source(self):

=== modified file 'metadata.yaml'
--- metadata.yaml	2016-03-03 20:08:09 +0000
+++ metadata.yaml	2016-07-08 08:37:32 +0000
@@ -8,6 +8,9 @@
  has request blocking capabilities and provides interface to display server
  status.
 tags: ["cache-proxy"]
+series:
+  - xenial
+  - trusty
 requires:
   reverseproxy:
     interface: http

=== removed file 'tests/10_deploy_test.py'
--- tests/10_deploy_test.py	2015-11-19 18:13:43 +0000
+++ tests/10_deploy_test.py	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-#!/usr/bin/python3
-
-# This Amulet test deploys haproxy and related charms.
-
-import os
-import amulet
-import requests
-import base64
-import yaml
-import time
-
-d = amulet.Deployment(series='trusty')
-# Add the haproxy charm to the deployment.
-d.add('haproxy')
-d.add('apache2', units=2)
-
-# Get the directory this way to load the file when CWD is different.
-path = os.path.abspath(os.path.dirname(__file__))
-template_path = os.path.join(path, 'default_apache.tmpl')
-# Read in the Apache2 default template file.
-with open(template_path) as f:
-    template = f.read()
-    encodedTemplate = base64.b64encode(template.encode('utf-8'))
-# Create a dictionary with configuration values for apache2.
-configuration = {'vhost_http_template': encodedTemplate.decode('ascii')}
-# Apache2 needs a base64 encoded template to configure the web site.
-d.configure('apache2', configuration)
-
-# Relate the haproxy to apache2.
-d.relate('haproxy:reverseproxy', 'apache2:website')
-# Make the haproxy visible to the outside world.
-d.expose('haproxy')
-
-# The number of seconds to wait for the environment to setup.
-seconds = 900
-try:
-    # Execute the deployer with the current mapping.
-    d.setup(timeout=seconds)
-    # Wait for the relation to finish the transations.
-    d.sentry.wait(seconds)
-except amulet.helpers.TimeoutError:
-    message = 'The environment did not setup in %d seconds.' % seconds
-    # The SKIP status enables skip or fail the test based on configuration.
-    amulet.raise_status(amulet.SKIP, msg=message)
-except:
-    raise
-
-# Test that haproxy is acting as the proxy for apache2.
-
-# Get the haproxy unit.
-haproxy_unit = d.sentry['haproxy'][0]
-haproxy_address = haproxy_unit.info['public-address']
-page = requests.get('http://%s/index.html' % haproxy_address)
-# Raise an error if the page does not load through haproxy.
-page.raise_for_status()
-print('Successfully got the Apache2 web page through haproxy IP address.')
-
-# Test that sticky session cookie is present
-if page.cookies.get('SRVNAME') != 'S0':
-    msg = 'Missing or invalid sticky session cookie value: %s' % page.cookies.get('SRVNAME')
-    amulet.raise_status(amulet.FAIL, msg=msg)
-
-# Test that the apache2 relation data is saved on the haproxy server.
-
-# Get the sentry for apache and get the private IP address.
-apache_unit = d.sentry['apache2'][0]
-# Get the relation.
-relation = apache_unit.relation('website', 'haproxy:reverseproxy')
-# Get the private address from the relation.
-apache_private = relation['private-address']
-
-print('Private address of the apache2 relation ', apache_private)
-
-# Grep the configuration file for the private address
-output, code = haproxy_unit.run('grep %s /etc/haproxy/haproxy.cfg' %
-                                apache_private)
-if code == 0:
-    print('Found the relation IP address in the haproxy configuration file!')
-    print(output)
-else:
-    print(output)
-    message = 'Unable to find the Apache IP address %s in the haproxy ' \
-              'configuration file.' % apache_private
-    amulet.raise_status(amulet.FAIL, msg=message)
-
-# Test SSL termination
-d.configure('haproxy', {
-    'source': 'backports',
-    'ssl_cert': 'SELFSIGNED',
-    'services': yaml.safe_dump([
-        {'service_name': 'apache',
-         'service_host': '0.0.0.0',
-         'service_port': 80,
-         'service_options': [
-             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0'
-         ],
-         'servers': [
-             ['apache', apache_private, 80, 'maxconn 50']]},
-        {'service_name': 'apache-ssl',
-         'service_port': 443,
-         'service_host': '0.0.0.0',
-         'service_options': [
-             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0'
-         ],
-         'crts': ['DEFAULT'],
-         'servers': [['apache', apache_private, 80, 'maxconn 50']]}])
-})
-time.sleep(10)
-d.sentry.wait(seconds)
-
-# We need a retry loop here, since there's no way to tell when the new
-# configuration is in place.
-url = 'http://%s/index.html' % haproxy_address
-secure_url = 'https://%s/index.html' % haproxy_address
-retries = 10
-for i in range(retries):
-    try:
-        page = requests.get(url)
-        page.raise_for_status()
-        page = requests.get(secure_url, verify=False)
-        page.raise_for_status()
-        success = True
-    except requests.exceptions.ConnectionError:
-        if i == retries - 1:
-            # This was the last one, let's fail
-            raise
-        time.sleep(6)
-    else:
-        break
-
-print('Successfully got the Apache2 web page through haproxy SSL termination.')
-
-apache_unit2 = d.sentry['apache2'][1]
-apache_private2 = apache_unit2.run("unit-get private-address")[0]
-
-# Create a file on the second apache unit's www directory.
-apache_unit2.run("echo foo > /var/www/html/foo")
-
-d.configure('haproxy', {
-    'services': yaml.safe_dump([
-        {'service_name': 'apache',
-         'service_host': '0.0.0.0',
-         'service_port': 80,
-         'service_options': [
-             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0',
-             'acl foo path_beg -i /foo', 'use_backend foo if foo',
-         ],
-         'servers': [
-             ['apache', apache_private, 80, 'maxconn 50']],
-         'backends': [
-             {'backend_name': 'foo',
-              'servers': [
-                  ['apache2', apache_private2, 80, 'maxconn 50']]}
-         ]}])
-})
-time.sleep(10)
-d.sentry.wait(seconds)
-
-# Let's exercise our URL-based routing by trying to fetch a URL that will
-# only work for the second apache unit (which is configured as server
-# of the extra backend).
-url = 'http://%s/foo' % haproxy_address
-
-# We need a retry loop here, since there's no way to tell when the new
-# configuration is in place.
-retries = 10
-for i in range(retries):
-    try:
-        page = requests.get(url)
-        page.raise_for_status()
-    except:
-        if i == retries - 1:
-            # This was the last one, let's fail
-            raise
-        time.sleep(6)
-    else:
-        break
-
-print('Successfully got the /foo URL from the second Apache unit.')
-
-# Send a message that the tests are complete.
-print('The haproxy tests are complete.')

=== added file 'tests/11_deploy_test_trusty.py'
--- tests/11_deploy_test_trusty.py	1970-01-01 00:00:00 +0000
+++ tests/11_deploy_test_trusty.py	2016-07-08 08:37:32 +0000
@@ -0,0 +1,182 @@
+#!/usr/bin/python3
+
+# This Amulet test deploys haproxy and related charms.
+
+import os
+import amulet
+import requests
+import base64
+import yaml
+import time
+
+d = amulet.Deployment(series='trusty')
+# Add the haproxy charm to the deployment.
+d.add('haproxy')
+d.add('apache2', units=2)
+
+# Get the directory this way to load the file when CWD is different.
+path = os.path.abspath(os.path.dirname(__file__))
+template_path = os.path.join(path, 'default_apache.tmpl')
+# Read in the Apache2 default template file.
+with open(template_path) as f:
+    template = f.read()
+    encodedTemplate = base64.b64encode(template.encode('utf-8'))
+# Create a dictionary with configuration values for apache2.
+configuration = {'vhost_http_template': encodedTemplate.decode('ascii')}
+# Apache2 needs a base64 encoded template to configure the web site.
+d.configure('apache2', configuration)
+
+# Relate the haproxy to apache2.
+d.relate('haproxy:reverseproxy', 'apache2:website')
+# Make the haproxy visible to the outside world.
+d.expose('haproxy')
+
+# The number of seconds to wait for the environment to setup.
+seconds = 900
+try:
+    # Execute the deployer with the current mapping.
+    d.setup(timeout=seconds)
+    # Wait for the relation to finish the transations.
+    d.sentry.wait(seconds)
+except amulet.helpers.TimeoutError:
+    message = 'The environment did not setup in %d seconds.' % seconds
+    # The SKIP status enables skip or fail the test based on configuration.
+    amulet.raise_status(amulet.SKIP, msg=message)
+except:
+    raise
+
+# Test that haproxy is acting as the proxy for apache2.
+
+# Get the haproxy unit.
+haproxy_unit = d.sentry['haproxy'][0]
+haproxy_address = haproxy_unit.info['public-address']
+page = requests.get('http://%s/index.html' % haproxy_address)
+# Raise an error if the page does not load through haproxy.
+page.raise_for_status()
+print('Successfully got the Apache2 web page through haproxy IP address.')
+
+# Test that sticky session cookie is present
+if page.cookies.get('SRVNAME') != 'S0':
+    msg = 'Missing or invalid sticky session cookie value: %s' % page.cookies.get('SRVNAME')
+    amulet.raise_status(amulet.FAIL, msg=msg)
+
+# Test that the apache2 relation data is saved on the haproxy server.
+
+# Get the sentry for apache and get the private IP address.
+apache_unit = d.sentry['apache2'][0]
+# Get the relation.
+relation = apache_unit.relation('website', 'haproxy:reverseproxy')
+# Get the private address from the relation.
+apache_private = relation['private-address']
+
+print('Private address of the apache2 relation ', apache_private)
+
+# Grep the configuration file for the private address
+output, code = haproxy_unit.run('grep %s /etc/haproxy/haproxy.cfg' %
+                                apache_private)
+if code == 0:
+    print('Found the relation IP address in the haproxy configuration file!')
+    print(output)
+else:
+    print(output)
+    message = 'Unable to find the Apache IP address %s in the haproxy ' \
+              'configuration file.' % apache_private
+    amulet.raise_status(amulet.FAIL, msg=message)
+
+# Test SSL termination
+d.configure('haproxy', {
+    'source': 'backports',
+    'ssl_cert': 'SELFSIGNED',
+    'services': yaml.safe_dump([
+        {'service_name': 'apache',
+         'service_host': '0.0.0.0',
+         'service_port': 80,
+         'service_options': [
+             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0'
+         ],
+         'servers': [
+             ['apache', apache_private, 80, 'maxconn 50']]},
+        {'service_name': 'apache-ssl',
+         'service_port': 443,
+         'service_host': '0.0.0.0',
+         'service_options': [
+             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0'
+         ],
+         'crts': ['DEFAULT'],
+         'servers': [['apache', apache_private, 80, 'maxconn 50']]}])
+})
+time.sleep(10)
+d.sentry.wait(seconds)
+
+# We need a retry loop here, since there's no way to tell when the new
+# configuration is in place.
+url = 'http://%s/index.html' % haproxy_address
+secure_url = 'https://%s/index.html' % haproxy_address
+retries = 10
+for i in range(retries):
+    try:
+        page = requests.get(url)
+        page.raise_for_status()
+        page = requests.get(secure_url, verify=False)
+        page.raise_for_status()
+        success = True
+    except requests.exceptions.ConnectionError:
+        if i == retries - 1:
+            # This was the last one, let's fail
+            raise
+        time.sleep(6)
+    else:
+        break
+
+print('Successfully got the Apache2 web page through haproxy SSL termination.')
+
+apache_unit2 = d.sentry['apache2'][1]
+apache_private2 = apache_unit2.run("unit-get private-address")[0]
+
+# Create a file on the second apache unit's www directory.
+apache_unit2.run("echo foo > /var/www/html/foo")
+
+d.configure('haproxy', {
+    'services': yaml.safe_dump([
+        {'service_name': 'apache',
+         'service_host': '0.0.0.0',
+         'service_port': 80,
+         'service_options': [
+             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0',
+             'acl foo path_beg -i /foo', 'use_backend foo if foo',
+         ],
+         'servers': [
+             ['apache', apache_private, 80, 'maxconn 50']],
+         'backends': [
+             {'backend_name': 'foo',
+              'servers': [
+                  ['apache2', apache_private2, 80, 'maxconn 50']]}
+         ]}])
+})
+time.sleep(10)
+d.sentry.wait(seconds)
+
+# Let's exercise our URL-based routing by trying to fetch a URL that will
+# only work for the second apache unit (which is configured as server
+# of the extra backend).
+url = 'http://%s/foo' % haproxy_address
+
+# We need a retry loop here, since there's no way to tell when the new
+# configuration is in place.
+retries = 10
+for i in range(retries):
+    try:
+        page = requests.get(url)
+        page.raise_for_status()
+    except:
+        if i == retries - 1:
+            # This was the last one, let's fail
+            raise
+        time.sleep(6)
+    else:
+        break
+
+print('Successfully got the /foo URL from the second Apache unit.')
+
+# Send a message that the tests are complete.
+print('The haproxy tests are complete.')

=== added file 'tests/12_deploy_test_xenial.py'
--- tests/12_deploy_test_xenial.py	1970-01-01 00:00:00 +0000
+++ tests/12_deploy_test_xenial.py	2016-07-08 08:37:32 +0000
@@ -0,0 +1,182 @@
+#!/usr/bin/python3
+
+# This Amulet test deploys haproxy and related charms.
+
+import os
+import amulet
+import requests
+import base64
+import yaml
+import time
+
+d = amulet.Deployment(series='xenial')
+# Add the haproxy charm to the deployment.
+d.add('haproxy')
+d.add('apache2', 'cs:trusty/apache2', units=2)
+
+# Get the directory this way to load the file when CWD is different.
+path = os.path.abspath(os.path.dirname(__file__))
+template_path = os.path.join(path, 'default_apache.tmpl')
+# Read in the Apache2 default template file.
+with open(template_path) as f:
+    template = f.read()
+    encodedTemplate = base64.b64encode(template.encode('utf-8'))
+# Create a dictionary with configuration values for apache2.
+configuration = {'vhost_http_template': encodedTemplate.decode('ascii')}
+# Apache2 needs a base64 encoded template to configure the web site.
+d.configure('apache2', configuration)
+
+# Relate the haproxy to apache2.
+d.relate('haproxy:reverseproxy', 'apache2:website')
+# Make the haproxy visible to the outside world.
+d.expose('haproxy')
+
+# The number of seconds to wait for the environment to setup.
+seconds = 900
+try:
+    # Execute the deployer with the current mapping.
+    d.setup(timeout=seconds)
+    # Wait for the relation to finish the transations.
+    d.sentry.wait(seconds)
+except amulet.helpers.TimeoutError:
+    message = 'The environment did not setup in %d seconds.' % seconds
+    # The SKIP status enables skip or fail the test based on configuration.
+    amulet.raise_status(amulet.SKIP, msg=message)
+except:
+    raise
+
+# Test that haproxy is acting as the proxy for apache2.
+
+# Get the haproxy unit.
+haproxy_unit = d.sentry['haproxy'][0]
+haproxy_address = haproxy_unit.info['public-address']
+page = requests.get('http://%s/index.html' % haproxy_address)
+# Raise an error if the page does not load through haproxy.
+page.raise_for_status()
+print('Successfully got the Apache2 web page through haproxy IP address.')
+
+# Test that sticky session cookie is present
+if page.cookies.get('SRVNAME') != 'S0':
+    msg = 'Missing or invalid sticky session cookie value: %s' % page.cookies.get('SRVNAME')
+    amulet.raise_status(amulet.FAIL, msg=msg)
+
+# Test that the apache2 relation data is saved on the haproxy server.
+
+# Get the sentry for apache and get the private IP address.
+apache_unit = d.sentry['apache2'][0]
+# Get the relation.
+relation = apache_unit.relation('website', 'haproxy:reverseproxy')
+# Get the private address from the relation.
+apache_private = relation['private-address']
+
+print('Private address of the apache2 relation ', apache_private)
+
+# Grep the configuration file for the private address
+output, code = haproxy_unit.run('grep %s /etc/haproxy/haproxy.cfg' %
+                                apache_private)
+if code == 0:
+    print('Found the relation IP address in the haproxy configuration file!')
+    print(output)
+else:
+    print(output)
+    message = 'Unable to find the Apache IP address %s in the haproxy ' \
+              'configuration file.' % apache_private
+    amulet.raise_status(amulet.FAIL, msg=message)
+
+# Test SSL termination
+d.configure('haproxy', {
+    'source': 'backports',
+    'ssl_cert': 'SELFSIGNED',
+    'services': yaml.safe_dump([
+        {'service_name': 'apache',
+         'service_host': '0.0.0.0',
+         'service_port': 80,
+         'service_options': [
+             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0'
+         ],
+         'servers': [
+             ['apache', apache_private, 80, 'maxconn 50']]},
+        {'service_name': 'apache-ssl',
+         'service_port': 443,
+         'service_host': '0.0.0.0',
+         'service_options': [
+             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0'
+         ],
+         'crts': ['DEFAULT'],
+         'servers': [['apache', apache_private, 80, 'maxconn 50']]}])
+})
+time.sleep(10)
+d.sentry.wait(seconds)
+
+# We need a retry loop here, since there's no way to tell when the new
+# configuration is in place.
+url = 'http://%s/index.html' % haproxy_address
+secure_url = 'https://%s/index.html' % haproxy_address
+retries = 10
+for i in range(retries):
+    try:
+        page = requests.get(url)
+        page.raise_for_status()
+        page = requests.get(secure_url, verify=False)
+        page.raise_for_status()
+        success = True
+    except requests.exceptions.ConnectionError:
+        if i == retries - 1:
+            # This was the last one, let's fail
+            raise
+        time.sleep(6)
+    else:
+        break
+
+print('Successfully got the Apache2 web page through haproxy SSL termination.')
+
+apache_unit2 = d.sentry['apache2'][1]
+apache_private2 = apache_unit2.run("unit-get private-address")[0]
+
+# Create a file on the second apache unit's www directory.
+apache_unit2.run("echo foo > /var/www/html/foo")
+
+d.configure('haproxy', {
+    'services': yaml.safe_dump([
+        {'service_name': 'apache',
+         'service_host': '0.0.0.0',
+         'service_port': 80,
+         'service_options': [
+             'mode http', 'balance leastconn', 'option httpchk GET / HTTP/1.0',
+             'acl foo path_beg -i /foo', 'use_backend foo if foo',
+         ],
+         'servers': [
+             ['apache', apache_private, 80, 'maxconn 50']],
+         'backends': [
+             {'backend_name': 'foo',
+              'servers': [
+                  ['apache2', apache_private2, 80, 'maxconn 50']]}
+         ]}])
+})
+time.sleep(10)
+d.sentry.wait(seconds)
+
+# Let's exercise our URL-based routing by trying to fetch a URL that will
+# only work for the second apache unit (which is configured as server
+# of the extra backend).
+url = 'http://%s/foo' % haproxy_address
+
+# We need a retry loop here, since there's no way to tell when the new
+# configuration is in place.
+retries = 10
+for i in range(retries):
+    try:
+        page = requests.get(url)
+        page.raise_for_status()
+    except:
+        if i == retries - 1:
+            # This was the last one, let's fail
+            raise
+        time.sleep(6)
+    else:
+        break
+
+print('Successfully got the /foo URL from the second Apache unit.')
+
+# Send a message that the tests are complete.
+print('The haproxy tests are complete.')