Merge "Functional tests should support DNS nameserver config"

magnum/tests/functional/common/config.py

@@ -103,6 +103,12 @@ class Config(object):
             raise Exception('config missing csr_location key')
         cls.csr_location = CONF.magnum.csr_location
 
+    @classmethod
+    def set_dns_nameserver(cls, config):
+        if 'dns_nameserver' not in CONF.magnum:
+            raise Exception('config missing dns_nameserver')
+        cls.dns_nameserver = CONF.magnum.dns_nameserver
+
     @classmethod
     def set_copy_logs(cls, config):
         if 'copy_logs' not in CONF.magnum:
@@ -125,4 +131,5 @@ class Config(object):
         cls.set_magnum_url(config)
         cls.set_master_flavor_id(config)
         cls.set_csr_location(config)
+        cls.set_dns_nameserver(config)
         cls.set_copy_logs(config)

magnum/tests/functional/common/datagen.py

@@ -203,7 +203,7 @@ def valid_swarm_baymodel():
     return baymodel_data(image_id=config.Config.image_id,
                          fixed_network="192.168.0.0/24",
                          flavor_id=config.Config.flavor_id, public=False,
-                         dns_nameserver="8.8.8.8",
+                         dns_nameserver=config.Config.dns_nameserver,
                          master_flavor_id=config.Config.master_flavor_id,
                          keypair_id=config.Config.keypair_id, coe="swarm",
                          docker_volume_size=3, cluster_distro=None,

magnum/tests/functional/tempest_tests/config.py

@@ -56,6 +56,10 @@ MagnumGroup = [
                default="/opt/stack/new/magnum/default.csr",
                help="CSR location for certificates."),
 
+    cfg.StrOpt("dns_nameserver",
+               default="8.8.8.8",
+               help="DNS nameserver to use for baymodels."),
+
     cfg.StrOpt("copy_logs",
                default=True,
                help="Specify whether to copy nova server logs on failure."),