| commit | 2031ff59dd8076369772de10c300a53c148e9473 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <dis.xcom@gmail.com> | Tue Oct 16 12:44:28 2018 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Tue Oct 16 12:44:28 2018 +0000 |
| tree | f88c0d356dea7ee38270021384a840589437f3c3 | |
| parent | 3bcb07418ac7649855af4a9a50732998d48da4fb [diff] | |
| parent | fb8f87bfd18757f5df2842592b49e84b3937546f [diff] |
Merge "Delete coredns and kube dns vars"
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml index 6f390af..0699684 100644 --- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml +++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
@@ -32,8 +32,6 @@ bmk_enabled: 'False' ceph_enabled: 'False' auditd_enabled: 'False' - kubernetes_coredns_enabled: False - kubernetes_kubedns_enabled: True cicd_control_node01_address: 10.167.8.91 cicd_control_node01_hostname: cid01 cicd_control_node02_address: 10.167.8.92
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml index bf26588..0414b30 100644 --- a/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml +++ b/tcp_tests/templates/cookied-cicd-k8s-calico-sl/cookiecutter-context-k8s-sl.yaml
@@ -191,4 +191,4 @@ tenant_vlan: '20' upstream_proxy_enabled: 'False' use_default_network_scheme: 'False' - vnf_onboarding_enabled: 'False' + vnf_onboarding_enabled: 'False' \ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml b/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml index 6b63c60..f042844 100644 --- a/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml +++ b/tcp_tests/templates/cookied-cicd-k8s-calico/cookiecutter-context-k8s.yaml
@@ -161,4 +161,4 @@ tenant_network_subnet: 10.167.6.0/24 tenant_vlan: '20' upstream_proxy_enabled: 'False' - use_default_network_scheme: 'False' + use_default_network_scheme: 'False' \ No newline at end of file