| commit | ae1277da5eeb0e0aedeb2c3643352cb076f0b565 | [log] [tgz] |
|---|---|---|
| author | Tatyanka Leontovich <tleontovich@mirantis.com> | Wed Apr 03 09:54:39 2019 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Wed Apr 03 09:54:39 2019 +0000 |
| tree | e91a0793f1f7a3361a038f95a9d2284b0155d0fa | |
| parent | 6bd7f9d70097651777099d2ca8c926e579287494 [diff] | |
| parent | 664947e5f4a861ba049ce4357464ca7989fa244c [diff] |
Merge "Disable encrypted on virt queens"
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 8df06c6..5665cd1 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
@@ -211,3 +211,4 @@ secrets_encryption_key_id: 'F5CB2ADC36159B03' # Used on CI only. secrets_encryption_private_key: '' + kubernetes_helm_enabled: 'True'
diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml index 5ddc3e0..df80d80 100644 --- a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml +++ b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
@@ -124,3 +124,4 @@ kubernetes_network_genie_enabled: 'True' kubernetes_genie_default_plugin: 'calico' kubernetes_virtlet_enabled: 'True' + kubernetes_helm_enabled: 'True'