Fix address ranges for openstack computes in cicd deploys
- fix ranges for deploy, control and tenant networks in:
cookied-cicd-pike-ovs-sl
cookied-cicd-pike-dvr-sl
cookied-cicd-pike-dpdk
- remove 'openstack_compute_backend_address_ranges' to avoid
misunderstanding. It is definitely not a tenant network.
To use an additional L2/L3 network for ceph, it should
be described in underlay.yaml address pools and l2 network
devices first.
Change-Id: I0d2fcbc27efb3d6c415dd223dd35fca6a23b59e1
diff --git a/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml b/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
index 99ad264..ce13598 100644
--- a/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
+++ b/tcp_tests/templates/cookied-bm-dpdk-pipeline/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
@@ -123,7 +123,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 10.167.11.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
diff --git a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
index cb97e5e..df9deee 100644
--- a/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-dvr-vxlan/salt-context-cookiecutter-openstack_ovs_dvr_vxlan.yaml
@@ -65,7 +65,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_compute_node01_hostname: cmp01
openstack_compute_node02_hostname: cmp02
openstack_compute_node01_address: 10.167.4.3
diff --git a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/salt-context-cookiecutter-openstack_ovs_dpdk.yaml b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
index 484b776..c137d12 100644
--- a/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-ovs-dpdk/salt-context-cookiecutter-openstack_ovs_dpdk.yaml
@@ -123,7 +123,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 10.167.11.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
diff --git a/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml b/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
index fdef434..8b0bd00 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dpdk/cookiecutter-context-pike-ovs-dpdk.yaml
@@ -95,12 +95,11 @@
openstack_cluster_size: compact
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
- openstack_compute_rack01_single_subnet: 172.16.10
- openstack_compute_rack01_tenant_subnet: 10.1.0
- openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
- openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
- openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
+ openstack_compute_rack01_single_subnet: 10.167.4
+ openstack_compute_rack01_tenant_subnet: 10.167.6
+ openstack_compute_single_address_ranges: 10.167.4.105-10.167.4.106
+ openstack_compute_deploy_address_ranges: 10.167.5.105-10.167.5.106
+ openstack_compute_tenant_address_ranges: 10.167.6.105-10.167.6.106
openstack_control_address: 10.167.4.100
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.4.101
diff --git a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml
index 7acd05a..298fd81 100644
--- a/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml
+++ b/tcp_tests/templates/cookied-cicd-pike-dvr-sl/cookiecutter-context-pike-dvr-sl.yaml
@@ -95,12 +95,11 @@
openstack_cluster_size: compact
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
- openstack_compute_rack01_single_subnet: 172.16.10
- openstack_compute_rack01_tenant_subnet: 10.1.0
- openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
- openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
- openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
+ openstack_compute_rack01_single_subnet: 10.167.4
+ openstack_compute_rack01_tenant_subnet: 10.167.6
+ openstack_compute_single_address_ranges: 10.167.4.105-10.167.4.106
+ openstack_compute_deploy_address_ranges: 10.167.5.105-10.167.5.106
+ openstack_compute_tenant_address_ranges: 10.167.6.105-10.167.6.106
openstack_control_address: 10.167.4.100
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.4.101
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 f9d1f15..c3e838d 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
@@ -95,12 +95,11 @@
openstack_cluster_size: compact
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
- openstack_compute_rack01_single_subnet: 172.16.10
- openstack_compute_rack01_tenant_subnet: 10.1.0
- openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
- openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
- openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
+ openstack_compute_rack01_single_subnet: 10.167.4
+ openstack_compute_rack01_tenant_subnet: 10.167.6
+ openstack_compute_single_address_ranges: 10.167.4.105-10.167.4.106
+ openstack_compute_deploy_address_ranges: 10.167.5.105-10.167.5.106
+ openstack_compute_tenant_address_ranges: 10.167.6.105-10.167.6.106
openstack_control_address: 10.167.4.100
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.4.101
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-cookiecutter-mcp-mitaka-dvr.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-cookiecutter-mcp-mitaka-dvr.yaml
index 8b320f4..58281a4 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-cookiecutter-mcp-mitaka-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr/_context-cookiecutter-mcp-mitaka-dvr.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-ovs/_context-cookiecutter-mcp-mitaka-ovs.yaml b/tcp_tests/templates/cookied-mcp-mitaka-ovs/_context-cookiecutter-mcp-mitaka-ovs.yaml
index 5f2ede6..ecc8054 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-ovs/_context-cookiecutter-mcp-mitaka-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-ovs/_context-cookiecutter-mcp-mitaka-ovs.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-newton-dvr/_context-cookiecutter-mcp-newton-dvr.yaml b/tcp_tests/templates/cookied-mcp-newton-dvr/_context-cookiecutter-mcp-newton-dvr.yaml
index 5773e62..9cb3979 100644
--- a/tcp_tests/templates/cookied-mcp-newton-dvr/_context-cookiecutter-mcp-newton-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-newton-dvr/_context-cookiecutter-mcp-newton-dvr.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-newton-ovs/_context-cookiecutter-mcp-newton-ovs.yaml b/tcp_tests/templates/cookied-mcp-newton-ovs/_context-cookiecutter-mcp-newton-ovs.yaml
index 1786959..8049430 100644
--- a/tcp_tests/templates/cookied-mcp-newton-ovs/_context-cookiecutter-mcp-newton-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-newton-ovs/_context-cookiecutter-mcp-newton-ovs.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-cookiecutter-pike-ovs-dpdk.yaml b/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-cookiecutter-pike-ovs-dpdk.yaml
index 807b66a..4fdad27 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-cookiecutter-pike-ovs-dpdk.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dpdk/_context-cookiecutter-pike-ovs-dpdk.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml b/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
index cbc0f81..7df1f81 100644
--- a/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
@@ -136,7 +136,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 10.167.4.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.4.11
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 111520b..78e01ab 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
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml b/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
index 131d153..700799a 100644
--- a/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-pike-ovs/_context-cookiecutter-mcp-pike-ovs.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
index 135a2c4..39099ee 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ceph/cookiecutter-context-dvr-ceph.yaml
@@ -135,7 +135,6 @@
openstack_compute_single_address_ranges: 10.167.4.105-10.167.4.106
openstack_compute_deploy_address_ranges: 10.167.5.105-10.167.5.106
openstack_compute_tenant_address_ranges: 10.167.6.105-10.167.6.106
- openstack_compute_backend_address_ranges: 10.167.6.105-10.167.6.106
openstack_dns_hostname: dns
openstack_dns_node01_address: 10.167.4.111
openstack_dns_node01_hostname: dns01
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
index 35587d1..92f97ba 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr-ssl/_context-cookiecutter-mcp-queens-dvr-ssl.yaml
@@ -58,7 +58,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
index a37d4e2..6e2b79a 100644
--- a/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-dvr/_context-cookiecutter-mcp-queens-dvr.yaml
@@ -58,7 +58,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
index a3707d1..0dac09d 100644
--- a/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
+++ b/tcp_tests/templates/cookied-mcp-queens-ovs/_context-cookiecutter-mcp-queens-ovs.yaml
@@ -58,7 +58,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml b/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
index 84c6c06..b860da9 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-dvr/_context-cookiecutter-mcp-ocata-dvr.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101
diff --git a/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml b/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml
index 3e27c69..5dffbd3 100644
--- a/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml
+++ b/tcp_tests/templates/virtual-mcp-ocata-ovs/_context-cookiecutter-mcp-ocata-ovs.yaml
@@ -54,7 +54,6 @@
openstack_compute_single_address_ranges: 172.16.10.105-172.16.10.106
openstack_compute_deploy_address_ranges: 192.168.10.105-192.168.10.106
openstack_compute_tenant_address_ranges: 10.1.0.105-10.1.0.106
- openstack_compute_backend_address_ranges: 10.1.0.105-10.1.0.106
openstack_control_address: 172.16.10.100
openstack_control_hostname: ctl
openstack_control_node01_address: 172.16.10.101