update ovs-maas model
Change-Id: I6a3fd0ebb93431360356437700404b5356295f0d
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 43b0fcd..a53b7ac 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -76,7 +76,7 @@
control_network_netmask: 255.255.255.0
control_network_subnet: 10.167.11.0/24
control_vlan: '2404'
- cookiecutter_template_branch: '2018.11.0'
+ cookiecutter_template_branch: 2018.11.0
cookiecutter_template_credentials: gerrit
cookiecutter_template_url: https://gerrit.mcp.mirantis.com/mk/cookiecutter-templates.git
deploy_network_gateway: 172.16.164.1
@@ -91,14 +91,23 @@
infra_bond_mode: active-backup
infra_deploy_nic: eth0
infra_kvm01_control_address: 10.167.11.241
- infra_kvm01_deploy_address: 172.16.164.11
+ infra_kvm01_deploy_address: 172.16.164.3
infra_kvm01_hostname: kvm01
infra_kvm02_control_address: 10.167.11.242
- infra_kvm02_deploy_address: 172.16.164.12
+ infra_kvm02_deploy_address: 172.16.164.4
infra_kvm02_hostname: kvm02
infra_kvm03_control_address: 10.167.11.243
- infra_kvm03_deploy_address: 172.16.164.13
+ infra_kvm03_deploy_address: 172.16.164.5
infra_kvm03_hostname: kvm03
+ infra_kvm04_control_address: 10.167.11.244
+ infra_kvm04_deploy_address: 172.16.164.6
+ infra_kvm04_hostname: kvm04
+ infra_kvm05_control_address: 10.167.11.245
+ infra_kvm05_deploy_address: 172.16.164.7
+ infra_kvm05_hostname: kvm05
+ infra_kvm06_control_address: 10.167.11.246
+ infra_kvm06_deploy_address: 172.16.164.8
+ infra_kvm06_hostname: kvm06
infra_kvm_vip_address: 10.167.11.240
infra_primary_first_nic: eth1
infra_primary_second_nic: eth2
@@ -108,259 +117,577 @@
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.55
- maas_deploy_range_start: 172.16.164.15
+ maas_deploy_range_end: 172.16.164.62
+ maas_deploy_range_start: 172.16.164.18
maas_deploy_vlan: '0'
maas_dhcp_enabled: 'True'
maas_fabric_name: fabric-0
maas_hostname: cfg01
maas_manage_deploy_network: 'True'
maas_machines: |
- kvm01: # #cz7050-kvm.host-telecom.com
+ kvm01: # #cz7625-kvm.host-telecom.com
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
# pxe_interface_mac:
- pxe_interface_mac: "00:25:90:e3:37:2c"
+ pxe_interface_mac: "0c:c4:7a:33:24:be"
interfaces:
- enp3s0f0:
- mac: "00:25:90:e3:37:2c"
- mode: "static"
- ip: "172.16.164.11"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "176.74.222.96"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- disk_layout:
- type: custom
- bootable_device: sda
- disk:
- vgroot:
- devices:
- - sda
- type: lvm
- volume:
- root:
- mount: /
- size: 74G
- type: ext4
- vgvar:
- devices:
- - sdb
- type: lvm
- volume:
- var:
- mount: /var/
- size: 931G
- type: ext4
- kvm02: # #cz7049-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "00:25:90:e3:3b:86"
- interfaces:
- enp3s0f0:
- mac: "00:25:90:e3:3b:86"
- mode: "static"
- ip: "172.16.164.12"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "176.74.222.94"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- disk_layout:
- type: custom
- bootable_device: sda
- disk:
- vgroot:
- devices:
- - sda
- type: lvm
- volume:
- root:
- mount: /
- size: 74G
- type: ext4
- vgvar:
- devices:
- - sdb
- type: lvm
- volume:
- var:
- mount: /var/
- size: 931G
- type: ext4
- kvm03: # #cz7048-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "00:25:90:e3:37:34"
- interfaces:
- enp3s0f0:
- mac: "00:25:90:e3:37:34"
- mode: "static"
- ip: "172.16.164.13"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "176.74.222.92"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- disk_layout:
- type: custom
- bootable_device: sda
- disk:
- vgroot:
- devices:
- - sda
- type: lvm
- volume:
- root:
- mount: /
- size: 74G
- type: ext4
- vgvar:
- devices:
- - sdb
- type: lvm
- volume:
- var:
- mount: /var/
- size: 931G
- type: ext4
- gtw01: # #cz7052-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "00:25:90:e3:37:12"
- interfaces:
- enp3s0f0:
- mac: "00:25:90:e3:37:12"
- mode: "static"
- ip: "172.16.164.5"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "176.74.222.100"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- gtw02: # #cz7051-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "00:25:90:e3:3b:a4"
- interfaces:
- enp3s0f0:
- mac: "00:25:90:e3:3b:a4"
- mode: "static"
- ip: "172.16.164.6"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "176.74.222.98"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- gtw03: # #cz7636-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:55:6a:28"
- interfaces:
- enp2s0f0:
- mac: "0c:c4:7a:55:6a:28"
- mode: "static"
- ip: "172.16.164.7"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "185.8.59.241"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- osd001: # #cz7922-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:6c:9b:16"
- interfaces:
- enp9s0f0:
- mac: "0c:c4:7a:6c:9b:16"
- mode: "static"
- ip: "172.16.164.8"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "5.43.227.32"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- osd002: # #cz7915-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:6d:3e:06"
- interfaces:
- enp9s0f0:
- mac: "0c:c4:7a:6d:3e:06"
- mode: "static"
- ip: "172.16.164.9"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "5.43.227.25"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- osd003: # #cz7921-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:6c:9b:94"
- interfaces:
- enp9s0f0:
- mac: "0c:c4:7a:6c:9b:94"
- mode: "static"
- ip: "172.16.164.10"
- subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
- gateway: ${_param:deploy_network_gateway}
- power_parameters:
- power_address: "5.43.227.31"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- cmp001: # #cz7913-kvm.host-telecom.com
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:6c:9a:1a"
- interfaces:
- enp9s0f0:
- mac: "0c:c4:7a:6c:9a:1a"
+ one1:
+ mac: "0c:c4:7a:33:24:be"
mode: "static"
ip: "172.16.164.3"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:33:24:bf"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:01:3e"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:01:3f"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:f3:ce"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:f3:cf"
+ name: sten2
power_parameters:
- power_address: "5.43.227.23"
+ power_address: "185.8.59.227"
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
- cmp002: # #cz7916-kvm.host-telecom.com
+ kvm02: # #cz7627-kvm.host-telecom.com
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:6c:89:4a"
+ pxe_interface_mac: "0c:c4:7a:33:2d:6a"
interfaces:
- enp9s0f9:
- mac: "0c:c4:7a:6c:89:4a"
+ one1:
+ mac: "0c:c4:7a:33:2d:6a"
mode: "static"
ip: "172.16.164.4"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:33:2d:6b"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:43:b8"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:43:b9"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:96:02"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:96:03"
+ name: sten2
power_parameters:
- power_address: "5.43.227.26"
+ power_address: "185.8.59.229"
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
- mcp_version: '2018.11.0'
- mcp_common_scripts_branch: '2018.11.0'
+ kvm03: # #cz7756-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:69:a0:4c"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:69:a0:4c"
+ mode: "static"
+ ip: "172.16.164.5"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:69:a0:4d"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:c0:c2:14"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:c0:c2:15"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:09:c2"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:09:c3"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.225.88"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ kvm04: # #cz7792-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ # pxe_interface_mac:
+ pxe_interface_mac: "0c:c4:7a:6c:83:5c"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:6c:83:5c"
+ mode: "static"
+ ip: "172.16.164.6"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:6c:83:5d"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:7d:98"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:7d:99"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:03:de"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:03:df"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.225.112"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ kvm05: # #cz7876-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:6c:88:d6"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:6c:88:d6"
+ mode: "static"
+ ip: "172.16.164.7"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:6c:88:d7"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:03:74"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:03:75"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:89:be"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:89:bf"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.225.208"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ kvm06: # #cz8073-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:df:ac"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:df:ac"
+ mode: "static"
+ ip: "172.16.164.8"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:df:ad"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:3a:f2"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:3a:f3"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:a6:4c"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:a6:4d"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.227.118"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ gtw01: # #cz9039-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:d5:84"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:d5:84"
+ mode: "static"
+ ip: "172.16.164.9"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:d5:85"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:41:b0"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:41:b1"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:90:d2"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:90:d3"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.229.28"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ gtw02: # #cz9048-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:d5:82"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:d5:82"
+ mode: "static"
+ ip: "172.16.164.10"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:d5:83"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:00:7c"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:00:7d"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:bc:88:8a"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:bc:88:8b"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.225.23"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ gtw03: # #cz8159-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:6c:bc:f6"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:6c:bc:f6"
+ mode: "static"
+ ip: "172.16.164.11"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:6c:bc:f7"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:9b:cc:32"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:9b:cc:33"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:c1:a5:04"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:c1:a5:05"
+ name: sten2
+ power_parameters:
+ power_address: "185.8.58.9"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ osd001: # #cz9040-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:c9:02"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:c9:02"
+ mode: "static"
+ ip: "172.16.164.12"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:c9:03"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:aa:90"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:aa:91"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:0a:a4"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:0a:a5"
+ name: sten2
+ power_parameters:
+ power_address: "185.8.58.246"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ osd002: # #cz9041-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:d5:60"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:d5:60"
+ mode: "static"
+ ip: "172.16.164.13"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:d5:61"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:04:2c"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:04:2d"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:01:f2"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:01:f3"
+ name: sten2
+ power_parameters:
+ power_address: "185.8.58.243"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ osd003: # #cz9042-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:c9:3a"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:c9:3a"
+ mode: "static"
+ ip: "172.16.164.14"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:c9:3b"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:33:d7:10"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:33:d7:11"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:0b:5f:50"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:0b:5f:51"
+ name: sten2
+ power_parameters:
+ power_address: "185.8.58.244"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ cmp001: # #cz9039-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:d6:aa"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:d6:aa"
+ mode: "static"
+ ip: "172.16.164.15"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:d6:ab"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:86:76"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:86:77"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:39:3c"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:39:3d"
+ name: sten2
+ power_parameters:
+ power_address: "185.8.58.248"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ cmp002: # #cz9046-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:ce:30"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:ce:30"
+ mode: "static"
+ ip: "172.16.164.16"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:ce:31"
+ name: one2
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:ce:31"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:e0:7d:e0"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:e0:7d:e1"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:0c:0e"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:0c:0f"
+ name: sten2
+ power_parameters:
+ power_address: "185.8.59.222"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ cmp003: # #cz8061-kvm.host-telecom.com
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:aa:e0:ce"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:aa:e0:ce"
+ mode: "static"
+ ip: "172.16.164.17"
+ subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
+ gateway: ${_param:deploy_network_gateway}
+ name: one1
+ one2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:aa:e0:cf"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:94:5e"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:94:5f"
+ name: ten2
+ sten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:87:e4"
+ name: sten1
+ sten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1f:87:e5"
+ name: sten2
+ power_parameters:
+ power_address: "5.43.225.228"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ mcp_version: 2018.11.0
+ mcp_common_scripts_branch: ''
offline_deployment: 'False'
opencontrail_enabled: 'False'
openldap_domain: cookied-cicd-ovs-maas.local
@@ -368,13 +695,13 @@
openldap_organisation: ${_param:cluster_name}
openstack_benchmark_node01_address: 10.167.11.95
openstack_benchmark_node01_hostname: bmk01
- openstack_cluster_size: compact
- openstack_compute_count: '2'
+ openstack_cluster_size: small
+ openstack_compute_count: '3'
openstack_compute_rack01_hostname: cmp
- openstack_compute_single_address_ranges: 10.167.11.3-10.167.11.4
- openstack_compute_deploy_address_ranges: 172.16.164.3-172.16.164.4
- openstack_compute_tenant_address_ranges: 10.167.12.3-10.167.12.4
- openstack_compute_backend_address_ranges: 10.167.12.3-10.167.12.4
+ 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_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
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
@@ -392,18 +719,18 @@
openstack_database_node03_address: 10.167.11.53
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
- openstack_gateway_node01_deploy_address: 172.16.164.5
- openstack_gateway_node02_deploy_address: 172.16.164.6
- openstack_gateway_node03_deploy_address: 172.16.164.7
+ 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_address: 10.167.11.224
openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node01_tenant_address: 10.167.12.5
- openstack_gateway_node02_address: 10.167.11.225
openstack_gateway_node02_hostname: gtw02
- openstack_gateway_node02_tenant_address: 10.167.12.6
- openstack_gateway_node03_address: 10.167.11.226
openstack_gateway_node03_hostname: gtw03
- openstack_gateway_node03_tenant_address: 10.167.12.7
+ openstack_gateway_node01_tenant_address: 10.167.12.9
+ openstack_gateway_node02_address: 10.167.11.225
+ openstack_gateway_node02_tenant_address: 10.167.12.10
+ openstack_gateway_node03_address: 10.167.11.226
+ openstack_gateway_node03_tenant_address: 10.167.12.11
openstack_message_queue_address: 10.167.11.40
openstack_message_queue_hostname: msg
openstack_message_queue_node01_address: 10.167.11.41
@@ -447,7 +774,7 @@
salt_master_address: 10.167.11.2
salt_master_hostname: cfg01
salt_master_management_address: 172.16.164.2
- shared_reclass_branch: '2018.11.0'
+ shared_reclass_branch: 2018.11.0
shared_reclass_url: https://gerrit.mcp.mirantis.com/salt-models/reclass-system.git
stacklight_enabled: 'True'
stacklight_log_address: 10.167.11.60
@@ -531,7 +858,7 @@
openstack_mysql_x509_enabled: 'True'
rabbitmq_ssl_enabled: 'True'
openstack_rabbitmq_x509_enabled: 'True'
- openstack_internal_protocol: 'https'
+ openstack_internal_protocol: 'http'
tenant_telemetry_enabled: 'True'
gnocchi_aggregation_storage: ceph
openstack_telemetry_address: 10.167.11.83
@@ -567,7 +894,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
@@ -601,4 +928,4 @@
hBP6Fk8iNWuOWQD+ohM/vMMnvIhk5jwlcwn+kF0ra04gi5KBFWSh/ddWMJxUtPC1
2htvlEc6zQAR6QfqXHmwhg1hP81JcpqpicQzCMhkzLoR1DC6stXdLg==
-----END RSA PRIVATE KEY-----
- octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
+ octavia_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2Oc8MmxBOgcG2ioijXmZ1Jil+LzPoMUyLwZujQoI3fc5Sfm45y1t22NR966G8jqnHVIKe/JaLT0W3x5bCr4rAsIYptTEu+oqW24nsrcsisZeS36apk3g71cp5Up9kf6ZBaSTFFaBfavxEo1XcaR0213vhWOE/5HpdIolDVnxvt4czXS/oiNNj+M9zOMr57IJ4SPiptKdXx4qWouGGq65JBGZQ7YNFKMtV2l1/YEHj8F1YWwNg6ZfuZvySkSv29D5zUkoxcPAPp6HPJTyQT7WRWbnM54TLgd1ggym9R83j0/VqdFXYhJDVkT6vbYgAwqXS16SsYfR7/U0/UMXmsg0z
\ No newline at end of file
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
index 25624a1..4e4c216 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-environment.yaml
@@ -17,10 +17,12 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ one1:
role: single_mgm_dhcp
- enp3s0f1:
- role: bond0_ab_ovs_vlan_ctl
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
kvm02.cookied-cicd-ovs-maas.local:
reclass_storage_name: infra_kvm_node02
@@ -28,10 +30,12 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ one1:
role: single_mgm_dhcp
- enp3s0f1:
- role: bond0_ab_ovs_vlan_ctl
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
kvm03.cookied-cicd-ovs-maas.local:
reclass_storage_name: infra_kvm_node03
@@ -39,10 +43,54 @@
- infra_kvm
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ one1:
role: single_mgm_dhcp
- enp3s0f1:
- role: bond0_ab_ovs_vlan_ctl
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
+
+ kvm04.cookied-cicd-ovs-maas.local:
+ reclass_storage_name: infra_kvm_node04
+ roles:
+ - infra_kvm_wo_gluster
+ - linux_system_codename_xenial
+ - salt_master_host
+ interfaces:
+ one1:
+ role: single_mgm_dhcp
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
+
+ kvm05.cookied-cicd-ovs-maas.local:
+ reclass_storage_name: infra_kvm_node05
+ roles:
+ - infra_kvm_wo_gluster
+ - linux_system_codename_xenial
+ - salt_master_host
+ interfaces:
+ one1:
+ role: single_mgm_dhcp
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
+
+ kvm06.cookied-cicd-ovs-maas.local:
+ reclass_storage_name: infra_kvm_node06
+ roles:
+ - infra_kvm_wo_gluster
+ - linux_system_codename_xenial
+ - salt_master_host
+ interfaces:
+ one1:
+ role: single_mgm_dhcp
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
osd<<count>>:
reclass_storage_name: ceph_osd_rack01
@@ -50,10 +98,12 @@
- ceph_osd
- linux_system_codename_xenial
interfaces:
- enp9s0f0:
- role: single_dhcp
- enp9s0f1:
- role: single_vlan_ctl
+ one1:
+ role: single_mgm_dhcp
+ ten2:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_ctl_lacp
# role: bond0_ab_vlan_ceph_storage_backend
cmp<<count>>:
@@ -62,10 +112,16 @@
- openstack_compute
- linux_system_codename_xenial
interfaces:
- enp9s0f0:
+ one1:
role: single_mgm_dhcp
- enp9s0f1:
- role: bond0_ab_dvr_vxlan_ctl_mesh_floating
+ ten1:
+ role: bond_ctl_lacp
+ ten2:
+ role: bond_prv_lacp
+ sten1:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_prv_lacp
gtw01.cookied-cicd-ovs-maas.local:
reclass_storage_name: openstack_gateway_node01
@@ -73,12 +129,16 @@
- openstack_gateway
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ one1:
role: single_mgm_dhcp
- enp3s0f1:
- role: bond0_ab_dvr_vxlan_ctl_mesh_external
- external_address: 172.17.42.5
- external_network_netmask: 255.255.255.192
+ ten1:
+ role: bond_ctl_lacp
+ ten2:
+ role: bond_prv_lacp
+ sten1:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_prv_lacp
gtw02.cookied-cicd-ovs-maas.local:
reclass_storage_name: openstack_gateway_node02
@@ -86,12 +146,16 @@
- openstack_gateway
- linux_system_codename_xenial
interfaces:
- enp3s0f0:
+ one1:
role: single_mgm_dhcp
- enp3s0f1:
- role: bond0_ab_dvr_vxlan_ctl_mesh_external
- external_address: 172.17.42.6
- external_network_netmask: 255.255.255.192
+ ten1:
+ role: bond_ctl_lacp
+ ten2:
+ role: bond_prv_lacp
+ sten1:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_prv_lacp
gtw03.cookied-cicd-ovs-maas.local:
reclass_storage_name: openstack_gateway_node03
@@ -99,9 +163,13 @@
- openstack_gateway
- linux_system_codename_xenial
interfaces:
- enp2s0f0:
+ one1:
role: single_mgm_dhcp
- enp2s0f1:
- role: bond0_ab_dvr_vxlan_ctl_mesh_external
- external_address: 172.17.42.7
- external_network_netmask: 255.255.255.192
+ ten1:
+ role: bond_ctl_lacp
+ ten2:
+ role: bond_prv_lacp
+ sten1:
+ role: bond_ctl_lacp
+ sten2:
+ role: bond_prv_lacp
diff --git a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml
index e0b365a..e9461ca 100644
--- a/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/cookied-cicd-ovs-maas/salt-context-vcp-environment.yaml
@@ -35,7 +35,7 @@
dbs01.cookied-cicd-ovs-maas.local:
reclass_storage_name: openstack_database_node01
roles:
- - openstack_database_leader_2018_8_0
+ - openstack_database_leader
- linux_system_codename_xenial
interfaces:
ens2:
@@ -46,7 +46,7 @@
dbs02.cookied-cicd-ovs-maas.local:
reclass_storage_name: openstack_database_node02
roles:
- - openstack_database_2018_8_0
+ - openstack_database
- linux_system_codename_xenial
interfaces:
ens2:
@@ -57,7 +57,7 @@
dbs03.cookied-cicd-ovs-maas.local:
reclass_storage_name: openstack_database_node03
roles:
- - openstack_database_2018_8_0
+ - openstack_database
- linux_system_codename_xenial
interfaces:
ens2:
diff --git a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-ovs-maas.yaml
index 7ce4d69..4020ee5 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-ovs-maas.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_cookied-cicd-ovs-maas.yaml
@@ -56,19 +56,3 @@
node_name: {{ HOSTNAME_CFG01 }}
retry: {count: 1, delay: 5}
skip_fail: false
-
-- description: Temporary workaround !! Fix or debug
- cmd: |
- sed -i 's/pg_num: 128/pg_num: 4/g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/ceph/setup.yml;
- sed -i 's/pgp_num: 128/pgp_num: 4/g' /srv/salt/reclass/classes/cluster/{{ SHARED.CLUSTER_NAME }}/ceph/setup.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: true
-
-- description: Temporary workaround for removing virtual gtw nodes
- cmd: |
- sed -i 's/\-\ system\.salt\.control\.sizes\.ovs\.compact//g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
- sed -i 's/\-\ system\.salt\.control\.placement\.ovs\.compact//g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: true