commit d7ecaa1924550cb550774f49167c671d9fd480d0
Author: Jonathan Rosser <jonathan.rosser@rd.bbc.co.uk>
Date:   Mon Jul 1 10:16:40 2019 +0100

    Save iptables rules for all Debian derivative operating systems
    
    This task was previously restricted to Ubuntu 16.04 and would be skipped
    on other debian derivative OS.
    
    Change-Id: I750d117086ee0c9b7756e8079379a5aa7705063c
    (cherry picked from commit 9c4e9cbe2c81f98b9a4b4f9347b1108a955f7b75)

diff --git a/tasks/octavia_post_install.yml b/tasks/octavia_post_install.yml
index f30d7cc..4c9db4a 100644
--- a/tasks/octavia_post_install.yml
+++ b/tasks/octavia_post_install.yml
@@ -23,10 +23,10 @@
 # This is totally odd: If you run the commands via run-parts (as the script
 # in the distro does) they return 1; but do their job. If you run them
 # directly they work. Ignoring errors for now --
-- name: save iptables rules (Ubuntu 16.04)
+- name: save iptables rules (Debian/Ubuntu)
   command: netfilter-persistent save
   ignore_errors: yes
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04'
+  when: ansible_os_family == 'Debian'
 
 - name: save iptables rules (CentOS & RHEL)
   command: service iptables save
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 01c1667..b06c71a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -20,11 +20,13 @@
     check:
       jobs:
         - openstack-ansible-linters
-        - openstack-ansible-functional-ubuntu-xenial
+        - openstack-ansible-functional-ubuntu-xenial:
+            voting: false
     experimental:
       jobs:
         - openstack-ansible-integrated-deploy-aio
     gate:
       jobs:
         - openstack-ansible-linters
-        - openstack-ansible-functional-ubuntu-xenial
+        - openstack-ansible-functional-ubuntu-xenial:
+            voting: false