Change management bm subnet to 172.16.180.0
-change ip addresses
-change sumnets
-fix bm pike and queens net mask
Change-Id: I92be9058208089ee0fd3ba0fc11d2d68e9b23405
Change-Id: I7125cfaab656d41a035ba8ceed341f35d62ae2b3
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 04adcc4..2499b71 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -21,9 +21,9 @@
control_vlan: '2404'
jenkins_pipelines_branch: 'release/2019.2.0'
- deploy_network_gateway: 172.16.164.1
- deploy_network_netmask: 255.255.255.192
- deploy_network_subnet: 172.16.164.0/26
+ deploy_network_gateway: 172.16.180.1
+ deploy_network_netmask: 255.255.254.0
+ deploy_network_subnet: 172.16.180.0/23
deployment_type: physical
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
@@ -32,22 +32,22 @@
infra_bond_mode: active-backup
infra_deploy_nic: eth0
infra_kvm01_control_address: 10.167.11.241
- infra_kvm01_deploy_address: 172.16.164.3
+ infra_kvm01_deploy_address: 172.16.180.3
infra_kvm01_hostname: kvm01
infra_kvm02_control_address: 10.167.11.242
- infra_kvm02_deploy_address: 172.16.164.4
+ infra_kvm02_deploy_address: 172.16.180.4
infra_kvm02_hostname: kvm02
infra_kvm03_control_address: 10.167.11.243
- infra_kvm03_deploy_address: 172.16.164.5
+ infra_kvm03_deploy_address: 172.16.180.5
infra_kvm03_hostname: kvm03
infra_kvm04_control_address: 10.167.11.244
- infra_kvm04_deploy_address: 172.16.164.6
+ infra_kvm04_deploy_address: 172.16.180.6
infra_kvm04_hostname: kvm04
infra_kvm05_control_address: 10.167.11.245
- infra_kvm05_deploy_address: 172.16.164.7
+ infra_kvm05_deploy_address: 172.16.180.7
infra_kvm05_hostname: kvm05
infra_kvm06_control_address: 10.167.11.246
- infra_kvm06_deploy_address: 172.16.164.8
+ infra_kvm06_deploy_address: 172.16.180.8
infra_kvm06_hostname: kvm06
infra_kvm_vip_address: 10.167.11.240
infra_primary_first_nic: eth1
@@ -55,11 +55,11 @@
kubernetes_enabled: 'False'
local_repositories: 'False'
maas_enabled: 'True'
- maas_deploy_address: 172.16.164.2
- maas_deploy_cidr: 172.16.164.0/26
- maas_deploy_gateway: 172.16.164.1
- maas_deploy_range_end: 172.16.164.61
- maas_deploy_range_start: 172.16.164.18
+ maas_deploy_address: 172.16.180.2
+ maas_deploy_cidr: 172.16.180.0/23
+ maas_deploy_gateway: 172.16.180.1
+ maas_deploy_range_end: 172.16.180.61
+ maas_deploy_range_start: 172.16.180.18
maas_dhcp_enabled: 'True'
maas_fabric_name: fabric-0
maas_hostname: cfg01
@@ -74,7 +74,7 @@
one1:
mac: "0c:c4:7a:33:24:be"
mode: "static"
- ip: "172.16.164.3"
+ ip: "172.16.180.3"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -111,7 +111,7 @@
one1:
mac: "0c:c4:7a:33:2d:6a"
mode: "static"
- ip: "172.16.164.4"
+ ip: "172.16.180.4"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -148,7 +148,7 @@
one1:
mac: "0c:c4:7a:69:a0:4c"
mode: "static"
- ip: "172.16.164.5"
+ ip: "172.16.180.5"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -186,7 +186,7 @@
one1:
mac: "0c:c4:7a:6c:83:5c"
mode: "static"
- ip: "172.16.164.6"
+ ip: "172.16.180.6"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -223,7 +223,7 @@
one1:
mac: "0c:c4:7a:6c:88:d6"
mode: "static"
- ip: "172.16.164.7"
+ ip: "172.16.180.7"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -260,7 +260,7 @@
one1:
mac: "0c:c4:7a:aa:df:ac"
mode: "static"
- ip: "172.16.164.8"
+ ip: "172.16.180.8"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -297,7 +297,7 @@
one1:
mac: "0c:c4:7a:aa:d5:84"
mode: "static"
- ip: "172.16.164.9"
+ ip: "172.16.180.9"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -334,7 +334,7 @@
one1:
mac: "0c:c4:7a:aa:d5:82"
mode: "static"
- ip: "172.16.164.10"
+ ip: "172.16.180.10"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -371,7 +371,7 @@
one1:
mac: "0c:c4:7a:6c:bc:f6"
mode: "static"
- ip: "172.16.164.11"
+ ip: "172.16.180.11"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -408,7 +408,7 @@
one1:
mac: "0c:c4:7a:aa:c9:02"
mode: "static"
- ip: "172.16.164.12"
+ ip: "172.16.180.12"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -445,7 +445,7 @@
one1:
mac: "0c:c4:7a:aa:d5:60"
mode: "static"
- ip: "172.16.164.13"
+ ip: "172.16.180.13"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -482,7 +482,7 @@
one1:
mac: "0c:c4:7a:aa:c9:3a"
mode: "static"
- ip: "172.16.164.14"
+ ip: "172.16.180.14"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -519,7 +519,7 @@
one1:
mac: "0c:c4:7a:aa:d6:aa"
mode: "static"
- ip: "172.16.164.15"
+ ip: "172.16.180.15"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -556,7 +556,7 @@
one1:
mac: "0c:c4:7a:aa:ce:30"
mode: "static"
- ip: "172.16.164.16"
+ ip: "172.16.180.16"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -597,7 +597,7 @@
one1:
mac: "0c:c4:7a:aa:e0:ce"
mode: "static"
- ip: "172.16.164.17"
+ ip: "172.16.180.17"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -639,7 +639,7 @@
openstack_compute_count: '3'
openstack_compute_rack01_hostname: cmp
openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.17
- openstack_compute_deploy_address_ranges: 172.16.164.15-172.16.164.17
+ openstack_compute_deploy_address_ranges: 172.16.180.15-172.16.180.17
openstack_compute_tenant_address_ranges: 10.167.12.15-10.167.12.17
openstack_compute_backend_address_ranges: 10.167.12.15-10.167.12.17
openstack_control_address: 10.167.11.10
@@ -659,9 +659,9 @@
openstack_database_node03_address: 10.167.11.53
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
- openstack_gateway_node01_deploy_address: 172.16.164.9
- openstack_gateway_node02_deploy_address: 172.16.164.10
- openstack_gateway_node03_deploy_address: 172.16.164.11
+ openstack_gateway_node01_deploy_address: 172.16.180.9
+ openstack_gateway_node02_deploy_address: 172.16.180.10
+ openstack_gateway_node03_deploy_address: 172.16.180.11
openstack_gateway_node01_address: 10.167.11.224
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
@@ -708,7 +708,7 @@
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
salt_master_address: 10.167.11.5
salt_master_hostname: cfg01
- salt_master_management_address: 172.16.164.2
+ salt_master_management_address: 172.16.180.2
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
stacklight_log_hostname: log
@@ -756,7 +756,7 @@
ceph_public_network_allocation: storage
ceph_cluster_network: "10.167.11.0/24"
ceph_osd_single_address_ranges: "10.167.11.200-10.167.11.202"
- ceph_osd_deploy_address_ranges: "172.16.164.8-172.16.164.10"
+ ceph_osd_deploy_address_ranges: "172.16.180.8-172.16.180.10"
ceph_osd_storage_address_ranges: "10.167.11.200-10.167.11.202"
ceph_osd_backend_address_ranges: "10.167.12.200-10.167.12.202"
ceph_osd_data_disks: "/dev/sdb"
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
index c9fd9d6..617b1fa 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay--user-data-foundation.yaml
@@ -68,7 +68,7 @@
auto ens3
iface ens3 inet static
address $management_static_ip
- netmask 255.255.255.192
+ netmask 255.255.254.0
gateway $management_gw
dns-nameservers $dnsaddress
diff --git a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
index 0d37b6f..f40da29 100644
--- a/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-pike-ovs-maas/underlay.hot
@@ -33,19 +33,19 @@
default: "172.17.42.0/26"
management_subnet_cidr:
type: string
- default: "172.16.164.0/26"
+ default: "172.16.180.0/23"
management_subnet_cfg01_ip:
type: string
- default: 172.16.164.2
+ default: 172.16.180.2
management_subnet_gateway_ip:
type: string
- default: 172.16.164.1
+ default: 172.16.180.1
management_subnet_pool_start:
type: string
- default: 172.16.164.3
+ default: 172.16.180.3
management_subnet_pool_end:
type: string
- default: 172.16.164.61
+ default: 172.16.180.61
salt_master_control_ip:
type: string
default: 10.167.11.5
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 62e2064..81d3bf7 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -36,9 +36,9 @@
control_vlan: '2404'
jenkins_pipelines_branch: 'release/2019.2.0'
- deploy_network_gateway: 172.16.164.1
- deploy_network_netmask: 255.255.255.192
- deploy_network_subnet: 172.16.164.0/26
+ deploy_network_gateway: 172.16.180.1
+ deploy_network_netmask: 255.255.254.0
+ deploy_network_subnet: 172.16.180.0/23
deployment_type: physical
dns_server01: 172.18.176.6
dns_server02: 172.18.224.6
@@ -47,22 +47,22 @@
infra_bond_mode: active-backup
infra_deploy_nic: eth0
infra_kvm01_control_address: 10.167.11.241
- infra_kvm01_deploy_address: 172.16.164.3
+ infra_kvm01_deploy_address: 172.16.180.3
infra_kvm01_hostname: kvm01
infra_kvm02_control_address: 10.167.11.242
- infra_kvm02_deploy_address: 172.16.164.4
+ infra_kvm02_deploy_address: 172.16.180.4
infra_kvm02_hostname: kvm02
infra_kvm03_control_address: 10.167.11.243
- infra_kvm03_deploy_address: 172.16.164.5
+ infra_kvm03_deploy_address: 172.16.180.5
infra_kvm03_hostname: kvm03
infra_kvm04_control_address: 10.167.11.244
- infra_kvm04_deploy_address: 172.16.164.6
+ infra_kvm04_deploy_address: 172.16.180.6
infra_kvm04_hostname: kvm04
infra_kvm05_control_address: 10.167.11.245
- infra_kvm05_deploy_address: 172.16.164.7
+ infra_kvm05_deploy_address: 172.16.180.7
infra_kvm05_hostname: kvm05
infra_kvm06_control_address: 10.167.11.246
- infra_kvm06_deploy_address: 172.16.164.8
+ infra_kvm06_deploy_address: 172.16.180.8
infra_kvm06_hostname: kvm06
infra_kvm_vip_address: 10.167.11.240
infra_primary_first_nic: eth1
@@ -70,11 +70,11 @@
kubernetes_enabled: 'False'
local_repositories: 'False'
maas_enabled: 'True'
- maas_deploy_address: 172.16.164.2
- maas_deploy_cidr: 172.16.164.0/26
- maas_deploy_gateway: 172.16.164.1
- maas_deploy_range_end: 172.16.164.62
- maas_deploy_range_start: 172.16.164.18
+ maas_deploy_address: 172.16.180.2
+ maas_deploy_cidr: 172.16.180.0/23
+ maas_deploy_gateway: 172.16.180.1
+ maas_deploy_range_end: 172.16.180.62
+ maas_deploy_range_start: 172.16.180.18
maas_dhcp_enabled: 'True'
maas_fabric_name: fabric-0
maas_hostname: cfg01
@@ -89,7 +89,7 @@
one1:
mac: "0c:c4:7a:33:24:be"
mode: "static"
- ip: "172.16.164.3"
+ ip: "172.16.180.3"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -126,7 +126,7 @@
one1:
mac: "0c:c4:7a:33:2d:6a"
mode: "static"
- ip: "172.16.164.4"
+ ip: "172.16.180.4"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -163,7 +163,7 @@
one1:
mac: "0c:c4:7a:69:a0:4c"
mode: "static"
- ip: "172.16.164.5"
+ ip: "172.16.180.5"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -201,7 +201,7 @@
one1:
mac: "0c:c4:7a:6c:83:5c"
mode: "static"
- ip: "172.16.164.6"
+ ip: "172.16.180.6"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -238,7 +238,7 @@
one1:
mac: "0c:c4:7a:6c:88:d6"
mode: "static"
- ip: "172.16.164.7"
+ ip: "172.16.180.7"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -275,7 +275,7 @@
one1:
mac: "0c:c4:7a:aa:df:ac"
mode: "static"
- ip: "172.16.164.8"
+ ip: "172.16.180.8"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -312,7 +312,7 @@
one1:
mac: "0c:c4:7a:aa:d5:84"
mode: "static"
- ip: "172.16.164.9"
+ ip: "172.16.180.9"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -349,7 +349,7 @@
one1:
mac: "0c:c4:7a:aa:d5:82"
mode: "static"
- ip: "172.16.164.10"
+ ip: "172.16.180.10"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -386,7 +386,7 @@
one1:
mac: "0c:c4:7a:6c:bc:f6"
mode: "static"
- ip: "172.16.164.11"
+ ip: "172.16.180.11"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -423,7 +423,7 @@
one1:
mac: "0c:c4:7a:aa:c9:02"
mode: "static"
- ip: "172.16.164.12"
+ ip: "172.16.180.12"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -460,7 +460,7 @@
one1:
mac: "0c:c4:7a:aa:d5:60"
mode: "static"
- ip: "172.16.164.13"
+ ip: "172.16.180.13"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -497,7 +497,7 @@
one1:
mac: "0c:c4:7a:aa:c9:3a"
mode: "static"
- ip: "172.16.164.14"
+ ip: "172.16.180.14"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -534,7 +534,7 @@
one1:
mac: "0c:c4:7a:aa:d6:aa"
mode: "static"
- ip: "172.16.164.15"
+ ip: "172.16.180.15"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -571,7 +571,7 @@
one1:
mac: "0c:c4:7a:aa:ce:30"
mode: "static"
- ip: "172.16.164.16"
+ ip: "172.16.180.16"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -612,7 +612,7 @@
one1:
mac: "0c:c4:7a:aa:e0:ce"
mode: "static"
- ip: "172.16.164.17"
+ ip: "172.16.180.17"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -654,7 +654,7 @@
openstack_compute_count: '3'
openstack_compute_rack01_hostname: cmp
openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.17
- openstack_compute_deploy_address_ranges: 172.16.164.15-172.16.164.17
+ openstack_compute_deploy_address_ranges: 172.16.180.15-172.16.180.17
openstack_compute_tenant_address_ranges: 10.167.12.15-10.167.12.17
openstack_compute_backend_address_ranges: 10.167.12.15-10.167.12.17
openstack_control_address: 10.167.11.10
@@ -674,9 +674,9 @@
openstack_database_node03_address: 10.167.11.53
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
- openstack_gateway_node01_deploy_address: 172.16.164.9
- openstack_gateway_node02_deploy_address: 172.16.164.10
- openstack_gateway_node03_deploy_address: 172.16.164.11
+ openstack_gateway_node01_deploy_address: 172.16.180.9
+ openstack_gateway_node02_deploy_address: 172.16.180.10
+ openstack_gateway_node03_deploy_address: 172.16.180.11
openstack_gateway_node01_address: 10.167.11.224
openstack_gateway_node01_hostname: gtw01
openstack_gateway_node02_hostname: gtw02
@@ -722,7 +722,7 @@
salt_api_password_hash: $6$qdIFillN$XnzP7oIXRcbroVch7nlthyrSekjKlWND8q2MtoMF3Wz2ymepjAOjyqpyR55nmbH9OQzS8EcQJ6sfr5hWKDesV1
salt_master_address: 10.167.11.5
salt_master_hostname: cfg01
- salt_master_management_address: 172.16.164.2
+ salt_master_management_address: 172.16.180.2
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
stacklight_log_hostname: log
@@ -779,7 +779,7 @@
ceph_public_network_allocation: storage
ceph_cluster_network: "10.167.11.0/24"
ceph_osd_single_address_ranges: "10.167.11.200-10.167.11.202"
- ceph_osd_deploy_address_ranges: "172.16.164.8-172.16.164.10"
+ ceph_osd_deploy_address_ranges: "172.16.180.8-172.16.180.10"
ceph_osd_storage_address_ranges: "10.167.11.200-10.167.11.202"
ceph_osd_backend_address_ranges: "10.167.12.200-10.167.12.202"
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml
index c9fd9d6..617b1fa 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay--user-data-foundation.yaml
@@ -68,7 +68,7 @@
auto ens3
iface ens3 inet static
address $management_static_ip
- netmask 255.255.255.192
+ netmask 255.255.254.0
gateway $management_gw
dns-nameservers $dnsaddress
diff --git a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
index eac31bf..4306ae5 100644
--- a/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-cicd-queens-ovs-maas/underlay.hot
@@ -33,19 +33,19 @@
default: "172.17.42.0/26"
management_subnet_cidr:
type: string
- default: "172.16.164.0/26"
+ default: "172.16.180.0/23"
management_subnet_cfg01_ip:
type: string
- default: 172.16.164.2
+ default: 172.16.180.2
management_subnet_gateway_ip:
type: string
- default: 172.16.164.1
+ default: 172.16.180.1
management_subnet_pool_start:
type: string
- default: 172.16.164.3
+ default: 172.16.180.3
management_subnet_pool_end:
type: string
- default: 172.16.164.61
+ default: 172.16.180.61
salt_master_control_ip:
type: string
default: 10.167.11.5
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
index 50653c2..71c6fe5 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -136,7 +136,7 @@
one1:
mac: "0c:c4:7a:33:24:be"
mode: "static"
- ip: "172.16.164.3"
+ ip: "172.16.180.3"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -173,7 +173,7 @@
one1:
mac: "0c:c4:7a:33:2d:6a"
mode: "static"
- ip: "172.16.164.4"
+ ip: "172.16.180.4"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -210,7 +210,7 @@
one1:
mac: "0c:c4:7a:69:a0:4c"
mode: "static"
- ip: "172.16.164.5"
+ ip: "172.16.180.5"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -248,7 +248,7 @@
one1:
mac: "0c:c4:7a:6c:83:5c"
mode: "static"
- ip: "172.16.164.6"
+ ip: "172.16.180.6"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -285,7 +285,7 @@
one1:
mac: "0c:c4:7a:6c:88:d6"
mode: "static"
- ip: "172.16.164.7"
+ ip: "172.16.180.7"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -322,7 +322,7 @@
one1:
mac: "0c:c4:7a:aa:df:ac"
mode: "static"
- ip: "172.16.164.8"
+ ip: "172.16.180.8"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -359,7 +359,7 @@
# one1:
# mac: "0c:c4:7a:aa:d5:84"
# mode: "static"
- # ip: "172.16.164.9"
+ # ip: "172.16.180.9"
# subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
# gateway: ${_param:deploy_network_gateway}
# name: one1
@@ -396,7 +396,7 @@
# one1:
# mac: "0c:c4:7a:aa:d5:82"
# mode: "static"
- # ip: "172.16.164.10"
+ # ip: "172.16.180.10"
# subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
# gateway: ${_param:deploy_network_gateway}
# name: one1
@@ -433,7 +433,7 @@
# one1:
# mac: "0c:c4:7a:6c:bc:f6"
# mode: "static"
- # ip: "172.16.164.11"
+ # ip: "172.16.180.11"
# subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
# gateway: ${_param:deploy_network_gateway}
# name: one1
@@ -470,7 +470,7 @@
one1:
mac: "0c:c4:7a:aa:c9:02"
mode: "static"
- ip: "172.16.164.12"
+ ip: "172.16.180.12"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -507,7 +507,7 @@
one1:
mac: "0c:c4:7a:aa:d5:60"
mode: "static"
- ip: "172.16.164.13"
+ ip: "172.16.180.13"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -544,7 +544,7 @@
one1:
mac: "0c:c4:7a:aa:c9:3a"
mode: "static"
- ip: "172.16.164.14"
+ ip: "172.16.180.14"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -581,7 +581,7 @@
one1:
mac: "0c:c4:7a:aa:d6:aa"
mode: "static"
- ip: "172.16.164.15"
+ ip: "172.16.180.15"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -618,7 +618,7 @@
one1:
mac: "0c:c4:7a:aa:ce:30"
mode: "static"
- ip: "172.16.164.16"
+ ip: "172.16.180.16"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -659,7 +659,7 @@
one1:
mac: "0c:c4:7a:aa:e0:ce"
mode: "static"
- ip: "172.16.164.17"
+ ip: "172.16.180.17"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
diff --git a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
index e11335f..8b01d59 100644
--- a/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-pike-contrail-sl/underlay.hot
@@ -35,19 +35,19 @@
default: "10.9.0.0/24"
management_subnet_cidr:
type: string
- default: "172.16.164.0/26"
+ default: "172.16.180.0/23"
management_subnet_cfg01_ip:
type: string
- default: 172.16.164.2
+ default: 172.16.180.2
management_subnet_gateway_ip:
type: string
- default: 172.16.164.1
+ default: 172.16.180.1
management_subnet_pool_start:
type: string
- default: 172.16.164.3
+ default: 172.16.180.3
management_subnet_pool_end:
type: string
- default: 172.16.164.61
+ default: 172.16.180.61
salt_master_control_ip:
type: string
default: 10.6.0.15
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
index d08c4c8..adac30b 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/salt-context-cookiecutter-contrail.yaml
@@ -136,7 +136,7 @@
one1:
mac: "0c:c4:7a:33:24:be"
mode: "static"
- ip: "172.16.164.3"
+ ip: "172.16.180.3"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -173,7 +173,7 @@
one1:
mac: "0c:c4:7a:33:2d:6a"
mode: "static"
- ip: "172.16.164.4"
+ ip: "172.16.180.4"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -210,7 +210,7 @@
one1:
mac: "0c:c4:7a:69:a0:4c"
mode: "static"
- ip: "172.16.164.5"
+ ip: "172.16.180.5"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -248,7 +248,7 @@
one1:
mac: "0c:c4:7a:6c:83:5c"
mode: "static"
- ip: "172.16.164.6"
+ ip: "172.16.180.6"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -285,7 +285,7 @@
one1:
mac: "0c:c4:7a:6c:88:d6"
mode: "static"
- ip: "172.16.164.7"
+ ip: "172.16.180.7"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -322,7 +322,7 @@
one1:
mac: "0c:c4:7a:aa:df:ac"
mode: "static"
- ip: "172.16.164.8"
+ ip: "172.16.180.8"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -359,7 +359,7 @@
# one1:
# mac: "0c:c4:7a:aa:d5:84"
# mode: "static"
- # ip: "172.16.164.9"
+ # ip: "172.16.180.9"
# subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
# gateway: ${_param:deploy_network_gateway}
# name: one1
@@ -396,7 +396,7 @@
# one1:
# mac: "0c:c4:7a:aa:d5:82"
# mode: "static"
- # ip: "172.16.164.10"
+ # ip: "172.16.180.10"
# subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
# gateway: ${_param:deploy_network_gateway}
# name: one1
@@ -433,7 +433,7 @@
# one1:
# mac: "0c:c4:7a:6c:bc:f6"
# mode: "static"
- # ip: "172.16.164.11"
+ # ip: "172.16.180.11"
# subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
# gateway: ${_param:deploy_network_gateway}
# name: one1
@@ -470,7 +470,7 @@
one1:
mac: "0c:c4:7a:aa:c9:02"
mode: "static"
- ip: "172.16.164.12"
+ ip: "172.16.180.12"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -507,7 +507,7 @@
one1:
mac: "0c:c4:7a:aa:d5:60"
mode: "static"
- ip: "172.16.164.13"
+ ip: "172.16.180.13"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -544,7 +544,7 @@
one1:
mac: "0c:c4:7a:aa:c9:3a"
mode: "static"
- ip: "172.16.164.14"
+ ip: "172.16.180.14"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -581,7 +581,7 @@
one1:
mac: "0c:c4:7a:aa:d6:aa"
mode: "static"
- ip: "172.16.164.15"
+ ip: "172.16.180.15"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -618,7 +618,7 @@
one1:
mac: "0c:c4:7a:aa:ce:30"
mode: "static"
- ip: "172.16.164.16"
+ ip: "172.16.180.16"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -659,7 +659,7 @@
one1:
mac: "0c:c4:7a:aa:e0:ce"
mode: "static"
- ip: "172.16.164.17"
+ ip: "172.16.180.17"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
diff --git a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
index b02b758..8bc2a84 100644
--- a/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
+++ b/tcp_tests/templates/heat-bm-cicd-queens-contrail-sl/underlay.hot
@@ -35,19 +35,19 @@
default: "10.9.0.0/24"
management_subnet_cidr:
type: string
- default: "172.16.164.0/26"
+ default: "172.16.180.0/23"
management_subnet_cfg01_ip:
type: string
- default: 172.16.164.2
+ default: 172.16.180.2
management_subnet_gateway_ip:
type: string
- default: 172.16.164.1
+ default: 172.16.180.1
management_subnet_pool_start:
type: string
- default: 172.16.164.3
+ default: 172.16.180.3
management_subnet_pool_end:
type: string
- default: 172.16.164.61
+ default: 172.16.180.61
salt_master_control_ip:
type: string
default: 10.6.0.15