Disable known_host_autopopulation to cfg01
Related-bug: MOSSUST-111
Change-Id: Ib06f3ae0b1c9ba79db888e7c67e1e812967f0021
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
index 3edf1f9..48ee357 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-cookiecutter-openstack_ovs.yaml
@@ -44,12 +44,6 @@
infra_kvm03_control_address: 10.167.11.243
infra_kvm03_deploy_address: 172.16.162.69
infra_kvm03_hostname: kvm03
- infra_kvm04_control_address: 10.167.11.244
- infra_kvm04_deploy_address: 172.16.162.70
- infra_kvm04_hostname: kvm04
- infra_kvm05_control_address: 10.167.11.245
- infra_kvm05_deploy_address: 172.16.162.71
- infra_kvm05_hostname: kvm05
infra_kvm_vip_address: 10.167.11.240
infra_primary_first_nic: eth1
infra_primary_second_nic: eth2
@@ -67,183 +61,7 @@
maas_hostname: cfg01
maas_manage_deploy_network: 'True'
maas_machines: |
- kvm01: # #cz7675
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- # pxe_interface_mac:
- pxe_interface_mac: "0c:c4:7a:33:26:74"
- interfaces:
- one1:
- mac: "0c:c4:7a:33:26:74"
- mode: "static"
- ip: "172.16.162.67"
- 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:26:75"
- name: one2
- ten1:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:1d:f3:3e"
- name: ten1
- ten2:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:1d:f3:3f"
- name: ten2
- power_parameters:
- power_address: "176.74.217.64"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- kvm02: # #cz7626
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:33:25:c2"
- interfaces:
- one1:
- mac: "0c:c4:7a:33:25:c2"
- mode: "static"
- ip: "172.16.162.68"
- 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:25:c3"
- name: one2
- ten1:
- mode: UNCONFIGURED
- mac: "00:25:90:61:c9:e0"
- name: ten1
- ten2:
- mode: UNCONFIGURED
- mac: "00:25:90:61:c9:e1"
- name: ten2
- power_parameters:
- power_address: "185.8.59.228"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- kvm03: # #cz7757
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:69:a0:50"
- interfaces:
- one1:
- mac: "0c:c4:7a:69:a0:50"
- mode: "static"
- ip: "172.16.162.69"
- 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:51"
- name: one2
- ten1:
- mode: UNCONFIGURED
- mac: "00:25:90:3a:f0:38"
- name: ten1
- ten2:
- mode: UNCONFIGURED
- mac: "00:25:90:3a:f0:39"
- name: ten2
- power_parameters:
- power_address: "5.43.225.89"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- kvm04: # #cz7899
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- # pxe_interface_mac:
- pxe_interface_mac: "0c:c4:7a:6d:3d:fa"
- interfaces:
- one1:
- mac: "0c:c4:7a:6d:3d:fa"
- mode: "static"
- ip: "172.16.162.70"
- 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:6d:3d:fb"
- name: one2
- ten1:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:1e:41:88"
- name: ten1
- ten2:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:1e:41:89"
- name: ten2
- power_parameters:
- power_address: "5.43.227.11"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- kvm05: # #cz7909
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:34:53:2a"
- interfaces:
- one1:
- mac: "0c:c4:7a:34:53:2a"
- mode: "static"
- ip: "172.16.162.71"
- 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:34:53:2b"
- name: one2
- ten1:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:1d:92:c8"
- name: ten1
- ten2:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:1d:92:c9"
- name: ten2
- power_parameters:
- power_address: "5.43.227.19"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- gtw01: # #cz7739
- distro_series: "xenial"
- # hwe_kernel: "hwe-16.04"
- pxe_interface_mac: "0c:c4:7a:34:52:0c"
- interfaces:
- one1:
- mac: "0c:c4:7a:34:52:0c"
- mode: "static"
- ip: "172.16.162.72"
- 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:34:52:0d"
- name: one2
- ten1:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:58:e9:66"
- name: ten1
- ten2:
- mode: UNCONFIGURED
- mac: "0c:c4:7a:58:e9:67"
- name: ten2
- power_parameters:
- power_address: "5.43.225.74"
- power_pass: ==IPMI_PASS==
- power_type: ipmi
- power_user: ==IPMI_USER==
- cmp001: # #cz7694
+ kvm01: # #cz7694
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:34:66:fe"
@@ -251,7 +69,7 @@
one1:
mac: "0c:c4:7a:34:66:fe"
mode: "static"
- ip: "172.16.162.73"
+ ip: "172.16.162.67"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -272,7 +90,7 @@
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
- cmp002: # #cz7950
+ kvm02: # #cz7950
distro_series: "xenial"
# hwe_kernel: "hwe-16.04"
pxe_interface_mac: "0c:c4:7a:6c:83:60"
@@ -280,7 +98,7 @@
one1:
mac: "0c:c4:7a:6c:83:60"
mode: "static"
- ip: "172.16.162.74"
+ ip: "172.16.162.68"
subnet: ${maas:region:subnets:deploy_network:cidr} # create it manually... in UI
gateway: ${_param:deploy_network_gateway}
name: one1
@@ -301,6 +119,183 @@
power_pass: ==IPMI_PASS==
power_type: ipmi
power_user: ==IPMI_USER==
+ kvm03: # #cz7739
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:34:52:0c"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:34:52:0c"
+ mode: "static"
+ ip: "172.16.162.69"
+ 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:34:52:0d"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:e9:66"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:58:e9:67"
+ name: ten2
+ power_parameters:
+ power_address: "5.43.225.74"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ gtw01: # #cz7675
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ # pxe_interface_mac:
+ pxe_interface_mac: "0c:c4:7a:33:26:74"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:33:26:74"
+ mode: "static"
+ ip: "172.16.162.70"
+ 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:26:75"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:f3:3e"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:f3:3f"
+ name: ten2
+ power_parameters:
+ power_address: "176.74.217.64"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ gtw02: # #cz7626
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:33:25:c2"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:33:25:c2"
+ mode: "static"
+ ip: "172.16.162.71"
+ 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:25:c3"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:61:c9:e0"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:61:c9:e1"
+ name: ten2
+ power_parameters:
+ power_address: "185.8.59.228"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ gtw03: # #cz7757
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:69:a0:50"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:69:a0:50"
+ mode: "static"
+ ip: "172.16.162.72"
+ 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:51"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "00:25:90:3a:f0:38"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "00:25:90:3a:f0:39"
+ name: ten2
+ power_parameters:
+ power_address: "5.43.225.89"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ cmp001: # #cz7899
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ # pxe_interface_mac:
+ pxe_interface_mac: "0c:c4:7a:6d:3d:fa"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:6d:3d:fa"
+ mode: "static"
+ ip: "172.16.162.73"
+ 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:6d:3d:fb"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:41:88"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1e:41:89"
+ name: ten2
+ power_parameters:
+ power_address: "5.43.227.11"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+ cmp002: # #cz7909
+ distro_series: "xenial"
+ # hwe_kernel: "hwe-16.04"
+ pxe_interface_mac: "0c:c4:7a:34:53:2a"
+ interfaces:
+ one1:
+ mac: "0c:c4:7a:34:53:2a"
+ mode: "static"
+ ip: "172.16.162.74"
+ 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:34:53:2b"
+ name: one2
+ ten1:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:92:c8"
+ name: ten1
+ ten2:
+ mode: UNCONFIGURED
+ mac: "0c:c4:7a:1d:92:c9"
+ name: ten2
+ power_parameters:
+ power_address: "5.43.227.19"
+ power_pass: ==IPMI_PASS==
+ power_type: ipmi
+ power_user: ==IPMI_USER==
+
mcp_version: proposed
mcp_docker_registry: docker-prod-local.docker.mirantis.net
mcp_common_scripts_branch: ''
@@ -311,13 +306,13 @@
openldap_organisation: ${_param:cluster_name}
openstack_benchmark_node01_address: 10.167.11.95
openstack_benchmark_node01_hostname: bmk01
- openstack_cluster_size: golden
+ openstack_cluster_size: compact
openstack_compute_count: '2'
openstack_compute_rack01_hostname: cmp
openstack_compute_single_address_ranges: 10.167.11.15-10.167.11.16
openstack_compute_deploy_address_ranges: 172.16.162.73-172.16.162.74
- openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.17
- openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.17
+ openstack_compute_tenant_address_ranges: 10.167.13.15-10.167.13.16
+ openstack_compute_backend_address_ranges: 10.167.13.15-10.167.13.16
openstack_control_address: 10.167.11.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
@@ -335,10 +330,18 @@
openstack_database_node03_address: 10.167.11.53
openstack_database_node03_hostname: dbs03
openstack_enabled: 'True'
- openstack_gateway_node01_deploy_address: 172.16.162.72
- openstack_gateway_node01_address: 10.167.11.224
openstack_gateway_node01_hostname: gtw01
- openstack_gateway_node01_tenant_address: 10.167.13.9
+ openstack_gateway_node01_deploy_address: 172.16.162.70
+ openstack_gateway_node01_address: 10.167.11.224
+ openstack_gateway_node01_tenant_address: 10.167.12.9
+ openstack_gateway_node02_hostname: gtw02
+ openstack_gateway_node02_deploy_address: 172.16.162.71
+ openstack_gateway_node02_address: 10.167.11.225
+ openstack_gateway_node02_tenant_address: 10.167.12.10
+ openstack_gateway_node03_hostname: gtw03
+ openstack_gateway_node03_deploy_address: 172.16.162.72
+ 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
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
index 1e2069f..b3849e4 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-environment.yaml
@@ -49,34 +49,6 @@
ten2:
role: bond_ctl_lacp
- kvm04.bm-e7-cicd-pike-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
- ten1:
- role: bond_ctl_lacp
- ten2:
- role: bond_ctl_lacp
-
- kvm05.bm-e7-cicd-pike-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
- ten1:
- role: bond_ctl_lacp
- ten2:
- role: bond_ctl_lacp
-
cmp<<count>>:
reclass_storage_name: openstack_compute_rack01
roles:
@@ -90,7 +62,6 @@
ten2:
role: bond_ctl_lacp
-
gtw01.bm-e7-cicd-pike-ovs-maas.local:
reclass_storage_name: openstack_gateway_node01
roles:
@@ -104,3 +75,28 @@
ten2:
role: bond_ctl_lacp
+ gtw02.bm-e7-cicd-pike-ovs-maas.local:
+ reclass_storage_name: openstack_gateway_node02
+ roles:
+ - openstack_gateway
+ - linux_system_codename_xenial
+ interfaces:
+ one1:
+ role: single_mgm_dhcp
+ ten1:
+ role: bond_ctl_lacp
+ ten2:
+ role: bond_ctl_lacp
+
+ gtw03.bm-e7-cicd-pike-ovs-maas.local:
+ reclass_storage_name: openstack_gateway_node03
+ roles:
+ - openstack_gateway
+ - linux_system_codename_xenial
+ interfaces:
+ one1:
+ role: single_mgm_dhcp
+ ten1:
+ role: bond_ctl_lacp
+ ten2:
+ role: bond_ctl_lacp
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
index 2bc00c8..fb60947 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt.yaml
@@ -95,17 +95,3 @@
{{SHARED_TEST_TOOLS.MACRO_INSTALL_RECLASS_TOOLS()}}
{{ SHARED_WORKAROUNDS.MACRO_CEPH_SET_PGNUM() }}
{{ SHARED_WORKAROUNDS.CLEAR_CEPH_OSD_DRIVES() }}
-
-- description: Disable known_hosts_autopopulation
- cmd: |
- set -ex;
- . /root/venv-reclass-tools/bin/activate;
- reclass-tools add-bool-key parameters.openssh.client.known_hosts_autopopulation false /srv/salt/reclass/nodes/_generated/cfg01.{{ LAB_CONFIG_NAME }}.local.yml
- cd /srv/salt/reclass
- git add /srv/salt/reclass/nodes/_generated
- git commit -m "[from tcp-qa] known_hosts_autopopulation disabled"
- salt -C 'I@salt:master' saltutil.refresh_pillar
- salt -C 'I@salt:master' saltutil.sync_all
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
\ No newline at end of file