Merge "Fix support for FWaaS for >= Newton"

templates/newton/fwaas_driver.ini

@@ -0,0 +1,9 @@
+# newton
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[fwaas]
+agent_version = v1
+driver = iptables
+enabled = True

templates/newton/l3_agent.ini

@@ -30,3 +30,6 @@ gateway_external_network_id = {{ ext_net_id }}
 external_network_bridge = br-ex
 {% endif -%}
 agent_mode = {{ agent_mode }}
+
+[AGENT]
+extensions = fwaas

tests/basic_deployment.py

@@ -679,7 +679,11 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         }
         section = 'fwaas'
 
-        if self._get_openstack_release() >= self.trusty_kilo:
+        if self._get_openstack_release() >= self.xenial_newton:
+            # Newton or later
+            expected['driver'] = 'iptables'
+            expected['agent_version'] = 'v1'
+        elif self._get_openstack_release() >= self.trusty_kilo:
             # Kilo or later
             expected['driver'] = ('neutron_fwaas.services.firewall.drivers.'
                                   'linux.iptables_fwaas.IptablesFwaasDriver')