| commit | 568bae11ea56882d3ba9cd3374a46b03aed58255 | [log] [tgz] |
|---|---|---|
| author | Dennis Dmitriev <dis.xcom@gmail.com> | Mon Nov 19 18:47:06 2018 +0000 |
| committer | Gerrit Code Review <support@gerrithub.io> | Mon Nov 19 18:47:06 2018 +0000 |
| tree | a16978ef61d5a44ca552c2074516fd7ceda4478c | |
| parent | 7df6961957a9dfbecdf8ec36f2c84020d3394dac [diff] | |
| parent | fc06e8766a75ff7edefd197968f62cb7c04798c3 [diff] |
Merge "Fix keepalived interface for kubernetes control nodes"
diff --git a/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml index 9e62bbf..c8fc345 100644 --- a/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml +++ b/tcp_tests/templates/cookied-bm-k8s-contrail/salt-context-cookiecutter-k8s-contrail.yaml
@@ -111,6 +111,7 @@ kubernetes_compute_single_address_ranges: 10.167.8.103-10.167.8.104 kubernetes_compute_tenant_address_ranges: 10.167.8.103-10.167.8.104 kubernetes_network_opencontrail_enabled: 'True' + kubernetes_keepalived_vip_interface: br_ctl kubernetes_metallb_enabled: 'False' # Not used with opencontrail metallb_addresses: 172.17.41.160-172.17.41.180 kubernetes_ingressnginx_enabled: 'True'