Merge "Make fixes for CC generating"
diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index 4970d6b..c85ff11 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -22,7 +22,7 @@
name: DRIVETRAIN_STACK_INSTALL_TIMEOUT
trim: 'false'
- string:
- default: openstack,ovs,ceph,stacklight
+ default: openstack,ovs,stacklight
description: Comma-separated list of stacks to deploy the target platform
(openstack and additional components)
name: PLATFORM_STACK_INSTALL
@@ -58,7 +58,7 @@
name: CFG01_CONFIG_IMAGE_NAME
trim: 'false'
- string:
- default: bm-cicd-pike-ovs-maas
+ default: bm-e7-cicd-pike-ovs-maas
description: ''
name: ENV_NAME
trim: 'false'
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 1387811..24efd98 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
@@ -382,8 +382,8 @@
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.12.15-10.167.12.17
- openstack_compute_backend_address_ranges: 10.167.12.15-10.167.12.17
+ 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_control_address: 10.167.11.10
openstack_control_hostname: ctl
openstack_control_node01_address: 10.167.11.11
@@ -404,7 +404,7 @@
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.12.9
+ openstack_gateway_node01_tenant_address: 10.167.13.9
openstack_message_queue_address: 10.167.11.40
openstack_message_queue_hostname: msg
openstack_message_queue_node01_address: 10.167.11.41
@@ -478,51 +478,14 @@
stacklight_telemetry_node03_hostname: mtr03
stacklight_version: '2'
static_ips_on_deploy_network_enabled: 'False'
- tenant_network_gateway: 10.167.12.1
+ tenant_network_gateway: 10.167.13.1
tenant_network_netmask: 255.255.255.0
- tenant_network_subnet: 10.167.12.0/24
+ tenant_network_subnet: 10.167.13.0/24
tenant_vlan: '2406'
upstream_proxy_enabled: 'False'
use_default_network_scheme: 'True'
sriov_network_subnet: 192.168.10.0/24
ceph_enabled: 'False'
- ceph_version: "luminous"
- ceph_hyper_converged: "False"
- ceph_osd_backend: "bluestore"
- ceph_osd_count: "3"
- ceph_osd_node_count: 3
- ceph_osd_block_db_size: 20
- ceph_osd_journal_size: 20
- ceph_osd_bond_mode: "active-backup"
- ceph_osd_data_partition_prefix: ""
- ceph_osd_block_partition_prefix: ""
- 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_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"
- ceph_osd_journal_or_block_db_disks: "/dev/sdc"
- ceph_osd_mode: "separated"
- ceph_osd_deploy_nic: "eth0"
- ceph_osd_primary_first_nic: "eth1"
- ceph_osd_primary_second_nic: "eth2"
- ceph_mon_node01_address: "10.167.11.66"
- ceph_mon_node01_hostname: "cmn01"
- ceph_mon_node02_address: "10.167.11.67"
- ceph_mon_node02_hostname: "cmn02"
- ceph_mon_node03_address: "10.167.11.68"
- ceph_mon_node03_hostname: "cmn03"
- ceph_rgw_address: "10.167.11.75"
- ceph_rgw_node01_address: "10.167.11.76"
- ceph_rgw_node01_hostname: "rgw01"
- ceph_rgw_node02_address: "10.167.11.77"
- ceph_rgw_node02_hostname: "rgw02"
- ceph_rgw_node03_address: "10.167.11.78"
- ceph_rgw_node03_hostname: "rgw03"
-
- ceph_public_network: 10.167.11.0/24
rsync_fernet_rotation: 'True'
compute_padding_with_zeros: True
@@ -557,10 +520,10 @@
openstack_barbican_node03_address: 10.167.11.47
openstack_barbican_node03_hostname: kmn03
openstack_create_public_network: 'True'
- openstack_public_neutron_subnet_gateway: 172.17.42.1
- openstack_public_neutron_subnet_cidr: 172.17.42.0/26
- openstack_public_neutron_subnet_allocation_start: 172.17.42.20
- openstack_public_neutron_subnet_allocation_end: 172.17.42.55
+ openstack_public_neutron_subnet_gateway: 172.17.42.65
+ openstack_public_neutron_subnet_cidr: 172.17.42.64/26
+ openstack_public_neutron_subnet_allocation_start: 172.17.42.82
+ openstack_public_neutron_subnet_allocation_end: 172.17.42.112
backend_vlan: '2402'
storage_vlan: '2405' # not implemented yet, placeholder
kqueen_custom_mail_enabled: 'False'
@@ -577,8 +540,6 @@
octavia_lb_mgmt_allocation_pool_start: 192.168.1.2
octavia_lb_mgmt_allocation_pool_end: 192.168.1.200
openstack_octavia_enabled: 'True'
- cinder_backup_engine: 'ceph'
- cinder_ceph_backup_pool_name: 'backups'
openstack_keystone_security:
disable_user_account_days_inactive: 7
lockout_failure_attempts: 60
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 3f7292f..820c2d5 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
@@ -93,20 +93,6 @@
sten2:
role: bond_ctl_lacp
- osd<<count>>:
- reclass_storage_name: ceph_osd_rack01
- roles:
- - ceph_osd
- - linux_system_codename_xenial
- interfaces:
- one1:
- role: single_mgm_dhcp
- ten2:
- role: bond_ctl_lacp
- sten2:
- role: bond_ctl_lacp
-# role: bond0_ab_vlan_ceph_storage_backend
-
cmp<<count>>:
reclass_storage_name: openstack_compute_rack01
roles:
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-vcp-environment.yaml b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-vcp-environment.yaml
index 69c09f7f..0e40c3a 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-vcp-environment.yaml
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/salt-context-vcp-environment.yaml
@@ -252,72 +252,6 @@
ens3:
role: single_ctl
- cmn01.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: ceph_mon_node01
- roles:
- - ceph_mon
- - linux_system_codename_xenial
- interfaces:
- ens2:
- role: single_dhcp
- ens3:
- role: single_ctl
-
- cmn02.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: ceph_mon_node02
- roles:
- - ceph_mon
- - linux_system_codename_xenial
- interfaces:
- ens2:
- role: single_dhcp
- ens3:
- role: single_ctl
-
- cmn03.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: ceph_mon_node03
- roles:
- - ceph_mon
- - linux_system_codename_xenial
- interfaces:
- ens2:
- role: single_dhcp
- ens3:
- role: single_ctl
-
- rgw01.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: ceph_rgw_node01
- roles:
- - ceph_rgw
- - linux_system_codename_xenial
- interfaces:
- ens2:
- role: single_dhcp
- ens3:
- role: single_ctl
-
- rgw02.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: ceph_rgw_node02
- roles:
- - ceph_rgw
- - linux_system_codename_xenial
- interfaces:
- ens2:
- role: single_dhcp
- ens3:
- role: single_ctl
-
- rgw03.bm-e7-cicd-pike-ovs-maas.local:
- reclass_storage_name: ceph_rgw_node03
- roles:
- - ceph_rgw
- - linux_system_codename_xenial
- interfaces:
- ens2:
- role: single_dhcp
- ens3:
- role: single_ctl
-
mdb01.bm-e7-cicd-pike-ovs-maas.local:
reclass_storage_name: openstack_telemetry_node01
roles:
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 61bceda..ffc0d69 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
@@ -15,6 +15,17 @@
skip_fail: false
{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'K7wy5Y39g6Ii',
+ [
+ "176.74.217.64",
+ "185.8.59.228",
+ "5.43.225.89",
+ "5.43.227.11",
+ "5.43.227.19",
+ "5.43.225.74",
+ "5.43.225.16",
+ "5.43.225.172"
+ ]) }}
{{ SHARED_MAAS.REBOOT_HW_NODES('engineer', 'K7wy5Y39g6Ii',
[
diff --git a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
index b626abb..b90cb1f 100644
--- a/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
+++ b/tcp_tests/templates/bm-e7-cicd-pike-ovs-maas/underlay.hot
@@ -27,10 +27,10 @@
default: "10.167.11.0/24"
tenant_subnet_cidr:
type: string
- default: "10.167.12.0/24"
+ default: "10.167.13.0/24"
external_subnet_cidr:
type: string
- default: "172.17.42.0/26"
+ default: "172.17.42.64/26"
management_subnet_cidr:
type: string
default: "172.16.162.64/26"
diff --git a/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml b/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml
new file mode 100644
index 0000000..a8f4a8d
--- /dev/null
+++ b/tcp_tests/templates/cookied-model-generator/salt_bm-e7-cicd-pike-ovs-maas.yaml
@@ -0,0 +1,62 @@
+{% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
+{% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
+
+# Other salt model repository parameters see in shared-salt.yaml
+{% set LAB_CONFIG_NAME = 'bm-e7-cicd-pike-ovs-maas' %}
+# Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME','bm-cicd-pike-ovs-maas') %}
+# Path to the context files used to render Cluster and Environment models
+{%- set CLUSTER_CONTEXT_NAME = 'salt-context-cookiecutter-openstack_ovs.yaml' %}
+{%- set ENVIRONMENT_CONTEXT_NAMES = ['salt-context-vcp-environment.yaml', 'salt-context-environment.yaml','salt-context-cookiecutter-openstack_ovs.yaml'] %}
+{%- set CONTROL_VLAN = os_env('CONTROL_VLAN', '2404') %}
+{%- set TENANT_VLAN = os_env('TENANT_VLAN', '2406') %}
+
+{%- set IPMI_USER = os_env('IPMI_USER', 'mcp-qa') %}
+{%- set IPMI_PASS = os_env('IPMI_PASS', 'password') %}
+
+
+{% import 'shared-salt.yaml' as SHARED with context %}
+
+{{ SHARED.MACRO_INSTALL_PACKAGES_ON_NODES(HOSTNAME_CFG01) }}
+
+{{ SHARED.MACRO_INSTALL_FORMULAS_FROM_UPDATE() }}
+
+{{ SHARED.MACRO_INSTALL_FORMULAS('\*') }}
+
+{{ SHARED.MACRO_UPLOAD_AND_IMPORT_GPG_ENCRYPTION_KEY() }}
+
+{{ SHARED.MACRO_GENERATE_COOKIECUTTER_MODEL(CONTROL_VLAN=CONTROL_VLAN, TENANT_VLAN=TENANT_VLAN) }}
+
+{{ SHARED.MACRO_GENERATE_AND_ENABLE_ENVIRONMENT_MODEL() }}
+
+
+- description: Temporary WR for correct bridge name according to envoronment templates
+ cmd: |
+ sed -i 's/br\-ctl/br\_ctl/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
+ sed -i 's/br\-mgm/br\_mgm/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/kvm.yml;
+ sed -i 's/br\-ctl/br\_ctl/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/openstack/gateway.yml;
+ salt '*' saltutil.refresh_pillar;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+{{ SHARED.MACRO_GENERATE_INVENTORY(RERUN_SALTMASTER_STATE=true) }}
+
+- description: Defining username and password params for IPMI access
+ cmd: |
+ sed -i 's/==IPMI_USER==/${_param:power_user}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ sed -i 's/==IPMI_PASS==/${_param:power_password}/g' /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+- description: "Add user/password for IPMI access"
+ cmd: |
+ set -e;
+ set -x;
+ . /root/venv-reclass-tools/bin/activate;
+ reclass-tools add-key parameters._param.power_user {{ IPMI_USER }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ reclass-tools add-key parameters._param.power_password {{ IPMI_PASS }} /srv/salt/reclass/classes/cluster/{{ LAB_CONFIG_NAME }}/infra/maas_machines.yml;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
\ No newline at end of file