@ -54,7 +54,8 @@ class TestClusterConductorWithK8s(base.TestCase):
' admission_control_list ' : ' fake_list ' ,
' prometheus_monitoring ' : ' False ' ,
' grafana_admin_passwd ' : ' fake_pwd ' ,
' kube_dashboard_enabled ' : ' True ' } ,
' kube_dashboard_enabled ' : ' True ' ,
' docker_volume_type ' : ' lvmdriver-1 ' } ,
' tls_disabled ' : False ,
' server_type ' : ' vm ' ,
' registry_enabled ' : False ,
@ -155,7 +156,8 @@ class TestClusterConductorWithK8s(base.TestCase):
' admission_control_list ' : ' fake_list ' ,
' prometheus_monitoring ' : ' False ' ,
' grafana_admin_passwd ' : ' fake_pwd ' ,
' kube_dashboard_enabled ' : ' True ' } ,
' kube_dashboard_enabled ' : ' True ' ,
' docker_volume_type ' : ' lvmdriver-1 ' } ,
' http_proxy ' : ' http_proxy ' ,
' https_proxy ' : ' https_proxy ' ,
' no_proxy ' : ' no_proxy ' ,
@ -178,6 +180,7 @@ class TestClusterConductorWithK8s(base.TestCase):
' number_of_minions ' : 1 ,
' number_of_masters ' : 1 ,
' docker_volume_size ' : 20 ,
' docker_volume_type ' : ' lvmdriver-1 ' ,
' docker_storage_driver ' : ' devicemapper ' ,
' discovery_url ' : ' https://discovery.etcd.io/test ' ,
' flannel_network_cidr ' : ' 10.101.0.0/16 ' ,
@ -261,6 +264,7 @@ class TestClusterConductorWithK8s(base.TestCase):
' dns_nameserver ' : ' dns_nameserver ' ,
' docker_storage_driver ' : ' devicemapper ' ,
' docker_volume_size ' : 20 ,
' docker_volume_type ' : ' lvmdriver-1 ' ,
' external_network ' : ' external_network_id ' ,
' fixed_network ' : ' fixed_network ' ,
' fixed_subnet ' : ' fixed_subnet ' ,
@ -359,6 +363,7 @@ class TestClusterConductorWithK8s(base.TestCase):
' prometheus_monitoring ' : ' False ' ,
' grafana_admin_passwd ' : ' fake_pwd ' ,
' kube_dashboard_enabled ' : ' True ' ,
' docker_volume_type ' : ' lvmdriver-1 ' ,
' insecure_registry_url ' : ' 10.0.0.1:5000 ' ,
' kube_version ' : ' fake-version ' ,
' magnum_url ' : ' http://127.0.0.1:9511/v1 ' ,
@ -689,6 +694,7 @@ class TestClusterConductorWithK8s(base.TestCase):
' network_driver ' : ' network_driver ' ,
' volume_driver ' : ' volume_driver ' ,
' docker_volume_size ' : 20 ,
' docker_volume_type ' : ' lvmdriver-1 ' ,
' docker_storage_driver ' : ' devicemapper ' ,
' discovery_url ' : ' https://address/token ' ,
' http_proxy ' : ' http_proxy ' ,