Merge "Remove fixed_network from functional tests"
This commit is contained in:
commit
1b43b61098
|
@ -110,7 +110,6 @@ def baymodel_data(**kwargs):
|
|||
"docker_volume_size": 3,
|
||||
"labels": {},
|
||||
"public": False,
|
||||
"fixed_network": "192.168.0.0/24",
|
||||
"dns_nameserver": "8.8.8.8",
|
||||
"flavor_id": data_utils.rand_name('bay'),
|
||||
"master_flavor_id": data_utils.rand_name('bay'),
|
||||
|
@ -217,7 +216,6 @@ def valid_swarm_baymodel(is_public=False):
|
|||
"""
|
||||
|
||||
return baymodel_data(image_id=config.Config.image_id,
|
||||
fixed_network="192.168.0.0/24",
|
||||
flavor_id=config.Config.flavor_id, public=is_public,
|
||||
dns_nameserver=config.Config.dns_nameserver,
|
||||
master_flavor_id=config.Config.master_flavor_id,
|
||||
|
@ -353,7 +351,6 @@ def cluster_template_data(**kwargs):
|
|||
"docker_volume_size": 3,
|
||||
"labels": {},
|
||||
"public": False,
|
||||
"fixed_network": "192.168.0.0/24",
|
||||
"dns_nameserver": "8.8.8.8",
|
||||
"flavor_id": data_utils.rand_name('cluster'),
|
||||
"master_flavor_id": data_utils.rand_name('cluster'),
|
||||
|
@ -497,7 +494,6 @@ def valid_swarm_cluster_template(is_public=False):
|
|||
"""
|
||||
master_flavor_id = config.Config.master_flavor_id
|
||||
return cluster_template_data(image_id=config.Config.image_id,
|
||||
fixed_network="192.168.0.0/24",
|
||||
flavor_id=config.Config.flavor_id,
|
||||
public=is_public,
|
||||
dns_nameserver=config.Config.dns_nameserver,
|
||||
|
|
|
@ -17,6 +17,5 @@ class TestKubernetesAPIs(base.BaseK8sTest):
|
|||
cluster_template_kwargs = {
|
||||
"tls_disabled": False,
|
||||
"network_driver": 'flannel',
|
||||
"volume_driver": 'cinder',
|
||||
"fixed_network": '192.168.0.0/24'
|
||||
"volume_driver": 'cinder'
|
||||
}
|
||||
|
|
|
@ -17,6 +17,5 @@ class TestCoreosKubernetesAPIs(base.BaseK8sTest):
|
|||
cluster_template_kwargs = {
|
||||
"tls_disabled": True,
|
||||
"network_driver": 'flannel',
|
||||
"volume_driver": None,
|
||||
"fixed_network": '192.168.0.0/24'
|
||||
"volume_driver": None
|
||||
}
|
||||
|
|
|
@ -35,7 +35,6 @@ class TestSwarmAPIs(ClusterTest):
|
|||
"tls_disabled": False,
|
||||
"network_driver": None,
|
||||
"volume_driver": None,
|
||||
"fixed_network": '192.168.0.0/24',
|
||||
"labels": {}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue