Merge pull request #178 from ChrisMacNaughton/dvr-networking

allow deployed bundle to use DVR

zaza/charm_tests/neutron/setup.py

@@ -25,6 +25,8 @@ from zaza.utilities import (
     juju as juju_utils,
     openstack as openstack_utils,
 )
+import zaza.model as model
+
 
 # The overcloud network configuration settings are declared.
 # These are the network configuration settings under test.
@@ -72,6 +74,10 @@ def basic_overcloud_network():
     network_config.update(DEFAULT_UNDERCLOUD_NETWORK_CONFIG)
     # Environment specific settings
     network_config.update(generic_utils.get_undercloud_env_vars())
+    # Deployed model settings
+    if (model.get_application_config('neutron-api')
+       .get('enable-dvr').get('value')):
+        network_config.update({"dvr_enabled": True})
 
     # Get keystone session
     keystone_session = openstack_utils.get_overcloud_keystone_session()