Upgrade haproxy and ansible to bionic

ansible/.gitignore

@@ -3,4 +3,4 @@ config
 info
 logfile
 rootfs
-ubuntu-16.04-ansible_16.04-1_amd64.tar.gz
+ubuntu-18.04-ansible_18.04-1_amd64.tar.gz

ansible/Makefile

@@ -7,6 +7,8 @@ all: info/init_ok bootstrap global finalize
 
 bootstrap:
 	dab bootstrap
+	dab install python-cffi-backend
+	dab install python3-cffi-backend
 	dab install ansible
 	install -m 0700 runonce.sh ${BASEDIR}/etc/init.d/firstboot
 	dab exec update-rc.d firstboot defaults
@@ -23,7 +25,7 @@ info/init_ok: dab.conf
 
 .PHONY: template
 template:
-	cp ubuntu-16.04-ansible_16.04-1_amd64.tar.gz /var/lib/vz/template/cache
+	cp ubuntu-18.04-ansible_18.04-1_amd64.tar.gz /var/lib/vz/template/cache
 
 .PHONY: clean
 clean:

ansible/README.md

@@ -1,5 +1,5 @@
 # Ansible
 
 - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
-- Total uncompressed image size is *649 MB*
-- Total compressed image size is *207 MB*
+- Total uncompressed image size is *739 MB*
+- Total compressed image size is *229 MB*

ansible/dab.conf

@@ -1,12 +1,12 @@
-Suite: xenial
+Suite: bionic
 CacheDir: ../cache
 Source: http://archive.ubuntu.com/ubuntu SUITE main restricted universe multiverse 
 Source: http://archive.ubuntu.com/ubuntu SUITE-updates main restricted universe multiverse  
 Source: http://archive.ubuntu.com/ubuntu SUITE-security main restricted universe multiverse 
 Source: http://ppa.launchpad.net/ansible/ansible/ubuntu SUITE main 
 Architecture: amd64
 Name: ansible
-Version: 16.04-1
+Version: 18.04-1
 Section: system
 Maintainer: Nathan Gardiner <[email protected]>
 Infopage: http://www.ansible.com

haproxy/.gitignore

@@ -3,4 +3,4 @@ config
 info
 logfile
 rootfs
-ubuntu-16.04-haproxy_16.04-1_amd64.tar.gz
+ubuntu-18.04-haproxy_18.04-1_amd64.tar.gz

haproxy/Makefile

@@ -8,6 +8,7 @@ all: info/init_ok bootstrap global finalize
 bootstrap:
 	dab bootstrap
 	dab install python-cffi-backend
+	dab install python3-cffi-backend
 	dab install letsencrypt haproxy
 	install -m 0700 runonce.sh ${BASEDIR}/etc/init.d/firstboot
 	dab exec update-rc.d firstboot defaults
@@ -28,7 +29,7 @@ info/init_ok: dab.conf
 
 .PHONY: template
 template:
-	cp ubuntu-16.04-haproxy_16.04-1_amd64.tar.gz /var/lib/vz/template/cache
+	cp ubuntu-18.04-haproxy_18.04-1_amd64.tar.gz /var/lib/vz/template/cache
 
 .PHONY: clean
 clean:

haproxy/README.md

@@ -10,5 +10,5 @@ This template provides a bootstrapped HAProxy system with the following pre-conf
 - HAProxy server will provide HTTP and HTTPS, with HTTP redirecting to HTTPS
 - HAProxy server will serve a static web page for status.check.localhost which can be used to check the HAProxy status from other platforms such as Amazon Route 53.
 - Adds any customizations such as root login enabled or SSH keys from ../Makefile.global
-- Total uncompressed image size is *0 MB*
-- Total compressed image size is *0 MB*
+- Total uncompressed image size is *692 MB*
+- Total compressed image size is *220 MB*

haproxy/dab.conf

@@ -1,13 +1,13 @@
-Suite: xenial
+Suite: bionic
 CacheDir: ../cache
 Source: http://archive.ubuntu.com/ubuntu SUITE main restricted universe multiverse
 Source: http://archive.ubuntu.com/ubuntu SUITE-updates main restricted universe multiverse
 Source: http://archive.ubuntu.com/ubuntu SUITE-security main restricted universe multiverse
 Architecture: amd64
 Name: haproxy
-Version: 16.04-1
+Version: 18.04-1
 Section: system
 Maintainer: Nathan Gardiner <[email protected]>
 Infopage: http://www.ubuntu.com
-Description: Ubuntu Xenial 16.04 (standard)
- A standard Ubuntu Xenial system with template customizations.
+Description: HAProxy on Ubuntu Bionic (18.04)
+ The Reliable, High Performance TCP/HTTP Load Balancer