From e5282bb3f3988eaeb584c3afa3f8b50f38e9b875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Thu, 25 Apr 2024 14:20:54 +0200 Subject: [PATCH 1/5] Use osasinfra DT Depends on https://github.com/openstack-k8s-operators/architecture/pull/244/ --- .../reproducers/shift-on-stack-overrides.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/scenarios/reproducers/shift-on-stack-overrides.yml b/scenarios/reproducers/shift-on-stack-overrides.yml index 1123814a1c..5913812f83 100644 --- a/scenarios/reproducers/shift-on-stack-overrides.yml +++ b/scenarios/reproducers/shift-on-stack-overrides.yml @@ -8,3 +8,21 @@ cifmw_networking_mapper_definition_patches_01: networks: tenant: mtu: 1500 +cifmw_arch_automation_file: osasinfra.yaml +cifmw_architecture_scenario: osasinfra + +_arch_repo: "/home/zuul/src/github.com/openstack-k8s-operators/architecture" +cifmw_ceph_client_values_post_ceph_path_src: >- + {{ _arch_repo }}/examples/dt/osasinfra/values.yaml +cifmw_ceph_client_values_post_ceph_path_dst: >- + {{ cifmw_ceph_client_values_post_ceph_path_src }} +cifmw_ceph_client_service_values_post_ceph_path_src: >- + {{ _arch_repo }}/examples/dt/osasinfra/service-values.yaml +cifmw_ceph_client_service_values_post_ceph_path_dst: >- + {{ cifmw_ceph_client_service_values_post_ceph_path_src }} + +cifmw_ceph_daemons_layout: + rgw_enabled: true + dashboard_enabled: false + cephfs_enabled: true + ceph_nfs_enabled: true From 9abea80c391bd6d3c4c552b54f2797070af5b95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 4 Jun 2024 18:04:58 +0200 Subject: [PATCH 2/5] Make it a standalone DT Copied missing values from `va-hci.yaml`. --- .../reproducers/shift-on-stack-overrides.yml | 120 ++++++++++++++++-- 1 file changed, 109 insertions(+), 11 deletions(-) diff --git a/scenarios/reproducers/shift-on-stack-overrides.yml b/scenarios/reproducers/shift-on-stack-overrides.yml index 5913812f83..f5ac8d6f52 100644 --- a/scenarios/reproducers/shift-on-stack-overrides.yml +++ b/scenarios/reproducers/shift-on-stack-overrides.yml @@ -1,17 +1,13 @@ -cifmw_libvirt_manager_compute_disksize: 200 -cifmw_libvirt_manager_compute_memory: 50 -cifmw_libvirt_manager_compute_cpus: 8 -cifmw_allow_vms_to_reach_osp_api: true -# HCI requires bigger size to hold OCP on OSP disks -cifmw_block_device_size: 100G -cifmw_networking_mapper_definition_patches_01: - networks: - tenant: - mtu: 1500 -cifmw_arch_automation_file: osasinfra.yaml +--- cifmw_architecture_scenario: osasinfra +cifmw_arch_automation_file: osasinfra.yaml +# Automation section. Most of those parameters will be passed to the +# controller-0 as-is and be consumed by the `deploy-va.sh` script. +# Please note, all paths are on the controller-0, meaning managed by the +# Framework. Please do not edit them! _arch_repo: "/home/zuul/src/github.com/openstack-k8s-operators/architecture" +cifmw_ceph_client_vars: /tmp/ceph_client.yml cifmw_ceph_client_values_post_ceph_path_src: >- {{ _arch_repo }}/examples/dt/osasinfra/values.yaml cifmw_ceph_client_values_post_ceph_path_dst: >- @@ -21,6 +17,108 @@ cifmw_ceph_client_service_values_post_ceph_path_src: >- cifmw_ceph_client_service_values_post_ceph_path_dst: >- {{ cifmw_ceph_client_service_values_post_ceph_path_src }} +# HERE if you want to overload kustomization, you can uncomment this parameter +# and push the data structure you want to apply. +# cifmw_architecture_user_kustomize: +# stage_0: +# 'network-values': +# data: +# starwars: Obiwan + +# HERE, if you want to stop the deployment loop at any stage, you can uncomment +# the following parameter and update the value to match the stage you want to +# reach. Known stages are: +# pre_kustomize_stage_INDEX +# pre_apply_stage_INDEX +# post_apply_stage_INDEX +# +# cifmw_deploy_architecture_stopper: + +cifmw_allow_vms_to_reach_osp_api: true +cifmw_networking_mapper_definition_patches_01: + networks: + tenant: + mtu: 1500 + +# HCI requires bigger size to hold OCP on OSP disks +cifmw_block_device_size: 100G +cifmw_libvirt_manager_compute_disksize: 200 +cifmw_libvirt_manager_compute_memory: 50 +cifmw_libvirt_manager_compute_cpus: 8 + +cifmw_libvirt_manager_configuration: + networks: + osp_trunk: | + + osp_trunk + + + + + + vms: + ocp: + amount: 3 + admin_user: core + image_local_dir: "/home/dev-scripts/pool" + disk_file_name: "ocp_master" + disksize: "105" + xml_paths: + - /home/dev-scripts/ocp_master_0.xml + - /home/dev-scripts/ocp_master_1.xml + - /home/dev-scripts/ocp_master_2.xml + nets: + - osp_trunk + compute: + uefi: "{{ cifmw_use_uefi }}" + root_part_id: "{{ cifmw_root_partition_id }}" + amount: "{{ [cifmw_libvirt_manager_compute_amount|int, 3] | max }}" + image_url: "{{ cifmw_discovered_image_url }}" + sha256_image_name: "{{ cifmw_discovered_hash }}" + image_local_dir: "{{ cifmw_basedir }}/images/" + disk_file_name: "base-os.qcow2" + disksize: "{{ [cifmw_libvirt_manager_compute_disksize|int, 50] | max }}" + memory: "{{ [cifmw_libvirt_manager_compute_memory|int, 8] | max }}" + cpus: "{{ [cifmw_libvirt_manager_compute_cpus|int, 4] | max }}" + nets: + - ocpbm + - osp_trunk + controller: + uefi: "{{ cifmw_use_uefi }}" + root_part_id: "{{ cifmw_root_partition_id }}" + image_url: "{{ cifmw_discovered_image_url }}" + sha256_image_name: "{{ cifmw_discovered_hash }}" + image_local_dir: "{{ cifmw_basedir }}/images/" + disk_file_name: "base-os.qcow2" + disksize: 50 + memory: 8 + cpus: 4 + nets: + - ocpbm + - osp_trunk + +## devscript support for OCP deploy +cifmw_devscripts_config_overrides: + worker_memory: 16384 + worker_disk: 100 + worker_vcpu: 10 + num_extra_workers: 0 + fips_mode: "{{ cifmw_fips_enabled | default(false) | bool }}" + +# Note: with that extra_network_names "osp_trunk", we instruct +# devscripts role to create a new network, and associate it to +# the OCP nodes. This one is a "private network", and will hold +# the VLANs used for network isolation. + +# Please create a custom env file to provide: +# cifmw_devscripts_ci_token: +# cifmw_devscripts_pull_secret: + +# Test Ceph file and object storage (block is enabled by default) cifmw_ceph_daemons_layout: rgw_enabled: true dashboard_enabled: false From 6855bbfbcda95b5915defdacdfad4b976262693a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Tue, 4 Jun 2024 18:07:08 +0200 Subject: [PATCH 3/5] Rename the shift-on-stack overrides file Renamed from `shift-on-stack-overrides.yml` to `dt-osasinfra.yml` to highlight that it deploys the osasinfra DT. --- .../{shift-on-stack-overrides.yml => dt-osasinfra.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scenarios/reproducers/{shift-on-stack-overrides.yml => dt-osasinfra.yml} (100%) diff --git a/scenarios/reproducers/shift-on-stack-overrides.yml b/scenarios/reproducers/dt-osasinfra.yml similarity index 100% rename from scenarios/reproducers/shift-on-stack-overrides.yml rename to scenarios/reproducers/dt-osasinfra.yml From dc5d00743f2d0c1c3adcc636e8c554b02176c01c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Thu, 20 Jun 2024 09:34:53 +0200 Subject: [PATCH 4/5] Add workaround for ceph unreachable from controller --- scenarios/reproducers/dt-osasinfra.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scenarios/reproducers/dt-osasinfra.yml b/scenarios/reproducers/dt-osasinfra.yml index f5ac8d6f52..6126990153 100644 --- a/scenarios/reproducers/dt-osasinfra.yml +++ b/scenarios/reproducers/dt-osasinfra.yml @@ -17,6 +17,10 @@ cifmw_ceph_client_service_values_post_ceph_path_src: >- cifmw_ceph_client_service_values_post_ceph_path_dst: >- {{ cifmw_ceph_client_service_values_post_ceph_path_src }} + +# workaround https://issues.redhat.com/browse/OSPRH-6675 +cifmw_ceph_spec_public_network: "{{ cifmw_networking_definition.networks.ctlplane.network }}" + # HERE if you want to overload kustomization, you can uncomment this parameter # and push the data structure you want to apply. # cifmw_architecture_user_kustomize: From d29a7a136ed7770c125f3e56484c7518ea8f7294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Thu, 20 Jun 2024 13:48:02 +0200 Subject: [PATCH 5/5] Rebase on master --- scenarios/reproducers/dt-osasinfra.yml | 34 ++++++++++++++++++-------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/scenarios/reproducers/dt-osasinfra.yml b/scenarios/reproducers/dt-osasinfra.yml index 6126990153..05b251e6e8 100644 --- a/scenarios/reproducers/dt-osasinfra.yml +++ b/scenarios/reproducers/dt-osasinfra.yml @@ -57,6 +57,7 @@ cifmw_libvirt_manager_configuration: osp_trunk + + ocpbm: | + + ocpbm + + + + + + + ocppr: | + + ocppr + + + vms: ocp: amount: 3 admin_user: core - image_local_dir: "/home/dev-scripts/pool" + image_local_dir: "{{ cifmw_basedir }}/images/" disk_file_name: "ocp_master" - disksize: "105" - xml_paths: - - /home/dev-scripts/ocp_master_0.xml - - /home/dev-scripts/ocp_master_1.xml - - /home/dev-scripts/ocp_master_2.xml + disksize: "100" + cpus: 16 + memory: 32 + root_part_id: 4 + uefi: true nets: + - ocppr + - ocpbm - osp_trunk compute: uefi: "{{ cifmw_use_uefi }}" @@ -107,10 +125,6 @@ cifmw_libvirt_manager_configuration: ## devscript support for OCP deploy cifmw_devscripts_config_overrides: - worker_memory: 16384 - worker_disk: 100 - worker_vcpu: 10 - num_extra_workers: 0 fips_mode: "{{ cifmw_fips_enabled | default(false) | bool }}" # Note: with that extra_network_names "osp_trunk", we instruct