Chnage octavia ranges
Change-Id: I179544307aaf4e89b5379947e5f4eedc94e1421e
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index 6a62598..5fc114a 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -355,14 +355,14 @@
-----END RSA PRIVATE KEY-----
octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
openstack_octavia_enabled: 'True'
- 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_health_manager_node01_address: 192.168.10.10
+ octavia_health_manager_node02_address: 192.168.10.11
+ octavia_health_manager_node03_address: 192.168.10.12
octavia_manager_cluster: 'True'
- 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
- octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
+ octavia_hm_bind_ip: 192.168.10.12
+ octavia_lb_mgmt_cidr: 192.168.10.0/24
+ octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
+ octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
cinder_backup_engine: 'ceph'
cinder_ceph_backup_pool_name: 'backups'
jenkins_pipelines_branch: 'release/2019.2.0'
diff --git a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
index 6d85007..25d2e76 100644
--- a/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-dvr-sl/salt-context-environment.yaml
@@ -505,9 +505,9 @@
- linux_system_codename_xenial
- openstack_telemetry
interfaces:
- ens2:
- role: single_dhcp
ens3:
+ role: single_dhcp
+ ens4:
role: single_ctl
mdb02:
@@ -516,9 +516,9 @@
- linux_system_codename_xenial
- openstack_telemetry
interfaces:
- ens2:
- role: single_dhcp
ens3:
+ role: single_dhcp
+ ens4:
role: single_ctl
mdb03:
@@ -527,7 +527,7 @@
- linux_system_codename_xenial
- openstack_telemetry
interfaces:
- ens2:
- role: single_dhcp
ens3:
+ role: single_dhcp
+ ens4:
role: single_ctl
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
index 33584ea..aa79b74 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-cookiecutter.yaml
@@ -357,14 +357,14 @@
-----END RSA PRIVATE KEY-----
octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
openstack_octavia_enabled: 'True'
- 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_health_manager_node01_address: 192.168.10.10
+ octavia_health_manager_node02_address: 192.168.10.11
+ octavia_health_manager_node03_address: 192.168.10.12
octavia_manager_cluster: 'True'
- 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
- octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
+ octavia_hm_bind_ip: 192.168.10.12
+ octavia_lb_mgmt_cidr: 192.168.10.0/24
+ octavia_lb_mgmt_allocation_pool_start: 192.168.10.2
+ octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
cinder_backup_engine: 'ceph'
cinder_ceph_backup_pool_name: 'backups'
jenkins_pipelines_branch: 'release/2019.2.0'
diff --git a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
index 6d85007..25d2e76 100644
--- a/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-dvr-sl/salt-context-environment.yaml
@@ -505,9 +505,9 @@
- linux_system_codename_xenial
- openstack_telemetry
interfaces:
- ens2:
- role: single_dhcp
ens3:
+ role: single_dhcp
+ ens4:
role: single_ctl
mdb02:
@@ -516,9 +516,9 @@
- linux_system_codename_xenial
- openstack_telemetry
interfaces:
- ens2:
- role: single_dhcp
ens3:
+ role: single_dhcp
+ ens4:
role: single_ctl
mdb03:
@@ -527,7 +527,7 @@
- linux_system_codename_xenial
- openstack_telemetry
interfaces:
- ens2:
- role: single_dhcp
ens3:
+ role: single_dhcp
+ ens4:
role: single_ctl