commit | 6beb352e975d06951922d1bfb6d1dd817bf54b8b | [log] [tgz] |
---|---|---|
author | Dennis Dmitriev <dis.xcom@gmail.com> | Thu Jan 31 14:59:04 2019 +0000 |
committer | Gerrit Code Review <support@gerrithub.io> | Thu Jan 31 14:59:04 2019 +0000 |
tree | cbc59996c1ace8f4abd13aeb242f7ecac54b5fe6 | |
parent | 90ad04a172b5c79c65e9f1a14bbef7b62c8527ce [diff] | |
parent | 729887f7dcd6c4f51de2f03edb017a6e69545d84 [diff] |
Merge "Disable octavia_manager_cluster for all models"
diff --git a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml index 3e78a07..9956b91 100644 --- a/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml +++ b/tcp_tests/templates/cookied-cicd-pike-ovs-sl/cookiecutter-context-pike-ovs-sl.yaml
@@ -265,7 +265,7 @@ octavia_health_manager_node01_address: 192.168.1.10 octavia_health_manager_node02_address: 192.168.1.11 octavia_health_manager_node03_address: 192.168.1.12 - octavia_manager_cluster: 'True' + octavia_manager_cluster: 'False' octavia_hm_bind_ip: 192.168.1.12 octavia_lb_mgmt_cidr: 192.168.1.0/24 octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
diff --git a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml index aba63f2..b2f2ea5 100644 --- a/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml +++ b/tcp_tests/templates/cookied-cicd-queens-dvr-sl/cookiecutter-context-queens-dvr-sl.yaml
@@ -265,7 +265,7 @@ octavia_health_manager_node01_address: 192.168.1.10 octavia_health_manager_node02_address: 192.168.1.11 octavia_health_manager_node03_address: 192.168.1.12 - octavia_manager_cluster: 'True' + octavia_manager_cluster: 'False' octavia_hm_bind_ip: 192.168.1.12 octavia_lb_mgmt_cidr: 192.168.1.0/24 octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml index 6bd2435..f3535fc 100644 --- a/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml +++ b/tcp_tests/templates/cookied-mcp-pike-dvr/_context-cookiecutter-mcp-pike-dvr.yaml
@@ -230,7 +230,7 @@ octavia_health_manager_node01_address: 192.168.1.10 octavia_health_manager_node02_address: 192.168.1.11 octavia_health_manager_node03_address: 192.168.1.12 - octavia_manager_cluster: 'True' + octavia_manager_cluster: 'False' octavia_hm_bind_ip: 192.168.1.12 octavia_lb_mgmt_cidr: 192.168.1.0/24 octavia_lb_mgmt_allocation_pool_start: 192.168.1.2