From: Chris Wheeler <chwheele@redhat.com>
Date: Thu, 17 Apr 2025 00:40:28 +0000 (+0000)
Subject: Update OKD O-Cloud deployment automation to use OKD 4.19
X-Git-Tag: l-release~13
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=bc0bbe295378e380fbaa72d903458d23fb014510;p=pti%2Frtp.git

Update OKD O-Cloud deployment automation to use OKD 4.19

- Updated OKD version to 4.19.0
- Updated Stolostron version to 2.14.0
- Updated oran-o2ims
- Modified ocloud_infra_vm defaults to increase resource allocations
- Consolidated deployed preparation steps into new ocloud_setup role
- Integrated ocloud_platform_siteconfig, ocloud_platform_cgu, and
  ocloud_platform_mco roles into ocloud role

Change-Id: Id14e7ce026afe72d6463aa59f76d53578e6d9869
Signed-Off-By: Chris Wheeler <chwheele@redhat.com>
Issue-ID: INF-490
---

diff --git a/okd/roles/ocloud/tasks/main.yml b/okd/roles/ocloud/tasks/main.yml
index 4e20b804..c52293e4 100644
--- a/okd/roles/ocloud/tasks/main.yml
+++ b/okd/roles/ocloud/tasks/main.yml
@@ -25,6 +25,24 @@
   delegate_to: "{{ groups['deployer'][0] }}"
   when: ocloud_platform == "okd"
 
+- name: Include platform role - SiteConfig
+  ansible.builtin.import_role:
+    name: "ocloud_platform_siteconfig"
+  delegate_to: "{{ groups['deployer'][0] }}"
+  when: ocloud_platform == "okd"
+
+- name: Include platform role - ClusterGroupUpgrades
+  ansible.builtin.import_role:
+    name: "ocloud_platform_cgu"
+  delegate_to: "{{ groups['deployer'][0] }}"
+  when: ocloud_platform == "okd"
+
+- name: Include platform role - MultiClusterObservability
+  ansible.builtin.import_role:
+    name: "ocloud_platform_mco"
+  delegate_to: "{{ groups['deployer'][0] }}"
+  when: ocloud_platform == "okd"
+
 - name: Include platform role - oran-o2ims
   ansible.builtin.import_role:
     name: "ocloud_platform_o2ims"
diff --git a/okd/roles/ocloud_infra_vm/defaults/main.yml b/okd/roles/ocloud_infra_vm/defaults/main.yml
index 7c9ef666..a7dea75d 100644
--- a/okd/roles/ocloud_infra_vm/defaults/main.yml
+++ b/okd/roles/ocloud_infra_vm/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
-ocloud_infra_vm_cpus: 8
-ocloud_infra_vm_mem_gb: 24
-ocloud_infra_vm_disk_gb: 120
+ocloud_infra_vm_cpus: 16
+ocloud_infra_vm_mem_gb: 32
+ocloud_infra_vm_disk_gb: 150
 ocloud_infra_vm_disk_dir: "/var/lib/libvirt/images"
 ocloud_infra_vm_disk_path: "{{ ocloud_infra_vm_disk_dir }}/{{ inventory_hostname }}.qcow2"
 ocloud_infra_vm_image: "{{ ocloud_infra_vm_disk_dir }}/{{ inventory_hostname }}-image.iso"
diff --git a/okd/roles/ocloud_platform_cgu/tasks/main.yml b/okd/roles/ocloud_platform_cgu/tasks/main.yml
index 4b7c6343..d1b19a05 100644
--- a/okd/roles/ocloud_platform_cgu/tasks/main.yml
+++ b/okd/roles/ocloud_platform_cgu/tasks/main.yml
@@ -7,7 +7,7 @@
 - name: Install cluster-group-upgrades
   ansible.builtin.shell:
     chdir: "{{ ocloud_staging_dir['path'] }}/git/cluster-group-upgrades"
-    cmd: "make install deploy VERSION={{ ocloud_platform_cgu_snapshot }}"
+    cmd: "make install deploy VERSION={{ ocloud_platform_cgu_version }}"
   environment:
     PATH: "{{ ocloud_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}"
     KUBECONFIG: "{{ ocloud_platform_cgu_kubeconfig }}"
diff --git a/okd/roles/ocloud_platform_mco/templates/mco.yaml.j2 b/okd/roles/ocloud_platform_mco/templates/mco.yaml.j2
index 01147b79..aef06467 100644
--- a/okd/roles/ocloud_platform_mco/templates/mco.yaml.j2
+++ b/okd/roles/ocloud_platform_mco/templates/mco.yaml.j2
@@ -14,12 +14,19 @@ spec:
   advanced:
     alertmanager:
       replicas: {{ ocloud_platform_mco_replicas }}
+    compact:
+      resources:
+        requests:
+          memory: 512m
     grafana:
       replicas: {{ ocloud_platform_mco_replicas }}
     observatoriumAPI:
       replicas: {{ ocloud_platform_mco_replicas }}
     query:
       replicas: {{ ocloud_platform_mco_replicas }}
+      resources:
+        requests:
+          memory: 512m
     queryFrontend:
       replicas: {{ ocloud_platform_mco_replicas }}
     queryFrontendMemcached:
@@ -32,5 +39,8 @@ spec:
       replicas: {{ ocloud_platform_mco_replicas }}
     store:
       replicas: {{ ocloud_platform_mco_replicas }}
+      resources:
+        requests:
+          memory: 512m
     storeMemcached:
       replicas: {{ ocloud_platform_mco_replicas }}
diff --git a/okd/roles/ocloud_platform_o2ims/defaults/main.yml b/okd/roles/ocloud_platform_o2ims/defaults/main.yml
index 546295d3..85034c36 100644
--- a/okd/roles/ocloud_platform_o2ims/defaults/main.yml
+++ b/okd/roles/ocloud_platform_o2ims/defaults/main.yml
@@ -1,6 +1,4 @@
 ---
-ocloud_platform_o2ims_golang_url: "https://go.dev/dl/go1.23.2.linux-amd64.tar.gz"
 ocloud_platform_o2ims_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}"
 ocloud_platform_o2ims_repo_url: "https://github.com/openshift-kni/oran-o2ims.git"
-ocloud_platform_o2ims_repo_version: "osc-k-release"
-ocloud_platform_o2ims_service: "o2ims"
+ocloud_platform_o2ims_repo_version: "main"
diff --git a/okd/roles/ocloud_platform_o2ims/meta/main.yml b/okd/roles/ocloud_platform_o2ims/meta/main.yml
new file mode 100644
index 00000000..5b478055
--- /dev/null
+++ b/okd/roles/ocloud_platform_o2ims/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: ocloud_setup
diff --git a/okd/roles/ocloud_platform_o2ims/tasks/main.yml b/okd/roles/ocloud_platform_o2ims/tasks/main.yml
index 4ab2085a..4af58c26 100644
--- a/okd/roles/ocloud_platform_o2ims/tasks/main.yml
+++ b/okd/roles/ocloud_platform_o2ims/tasks/main.yml
@@ -1,87 +1,14 @@
 ---
-- name: Gather facts
-  ansible.builtin.setup:
-    gather_subset: all
-
-- name: Create staging dir for orano2ims installation
-  ansible.builtin.tempfile:
-    state: directory
-  register: ocloud_platform_o2ims_staging_dir
-
-- name: Create staging subdirs
-  ansible.builtin.file:
-    path: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/{{ item }}"
-    state: directory
-  loop:
-    - go
-    - git
-
-- name: Download golang
-  ansible.builtin.get_url:
-    url: "{{ ocloud_platform_o2ims_golang_url }}"
-    dest: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/go.linux-amd64.tar.gz"
-
-- name: Extract golang
-  ansible.builtin.unarchive:
-    src: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/go.linux-amd64.tar.gz"
-    dest: "{{ ocloud_platform_o2ims_staging_dir['path'] }}"
-    remote_src: true
-
 - name: Clone oran-o2ims repo
   ansible.builtin.git:
     repo: "{{ ocloud_platform_o2ims_repo_url }}"
     version: "{{ ocloud_platform_o2ims_repo_version }}"
-    dest: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/git"
-
-- name: Deploy oran-o2ims operator
-  ansible.builtin.shell:
-    chdir: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/git"
-    cmd: "make deploy"
-  environment:
-    PATH: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}"
-    KUBECONFIG: "{{ ocloud_platform_o2ims_kubeconfig }}"
+    dest: "{{ ocloud_staging_dir['path'] }}/git/oran-o2ims"
 
-- name: Install oran-o2ims custom resource definitions
+- name: Install oran-o2ims operator
   ansible.builtin.shell:
-    chdir: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/git"
-    cmd: "make install"
+    chdir: "{{ ocloud_staging_dir['path'] }}/git/oran-o2ims"
+    cmd: "make install deploy"
   environment:
-    PATH: "{{ ocloud_platform_o2ims_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}"
+    PATH: "{{ ocloud_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}"
     KUBECONFIG: "{{ ocloud_platform_o2ims_kubeconfig }}"
-
-- name: Get Infrastructure config
-  kubernetes.core.k8s_info:
-    api_version: config.openshift.io/v1
-    kind: Infrastructure
-    name: cluster
-    kubeconfig: "{{ ocloud_platform_o2ims_kubeconfig }}"
-  register: ocloud_platform_o2ims_infrastructure_info
-
-- name: Get IngressController config
-  kubernetes.core.k8s_info:
-    api_version: operator.openshift.io/v1
-    kind: IngressController
-    name: default
-    namespace: openshift-ingress-operator
-    kubeconfig: "{{ ocloud_platform_o2ims_kubeconfig }}"
-  register: ocloud_platform_o2ims_ingresscontroller_info
-
-- name: Get search-api Route config
-  kubernetes.core.k8s_info:
-    api_version: route.openshift.io/v1
-    kind: Route
-    name: search-api
-    namespace: open-cluster-management
-    kubeconfig: "{{ ocloud_platform_o2ims_kubeconfig }}"
-  register: ocloud_platform_o2ims_search_api_route_info
-
-- set_fact:
-    ocloud_platform_o2ims_api_url: "{{ ocloud_platform_o2ims_infrastructure_info['resources'][0]['status']['apiServerURL'] }}"
-    ocloud_platform_o2ims_ingress_host: "{{ ocloud_platform_o2ims_service }}.{{ ocloud_platform_o2ims_ingresscontroller_info['resources'][0]['status']['domain'] }}"
-    ocloud_platform_o2ims_search_api_url: "https://{{ ocloud_platform_o2ims_search_api_route_info['resources'][0]['spec']['host'] }}"
-
-- name: Create Inventory resource
-  kubernetes.core.k8s:
-    template: v1alpha1_inventory.yaml.j2
-    state: present
-    kubeconfig: "{{ ocloud_platform_o2ims_kubeconfig }}"
diff --git a/okd/roles/ocloud_platform_o2ims/templates/v1alpha1_inventory.yaml.j2 b/okd/roles/ocloud_platform_o2ims/templates/v1alpha1_inventory.yaml.j2
deleted file mode 100644
index ff87c2bb..00000000
--- a/okd/roles/ocloud_platform_o2ims/templates/v1alpha1_inventory.yaml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: o2ims.oran.openshift.io/v1alpha1
-kind: Inventory
-metadata:
-  labels:
-    app.kubernetes.io/name: inventory
-    app.kubernetes.io/instance: inventory-sample
-    app.kubernetes.io/part-of: oran-o2ims
-    app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: oran-o2ims
-  name: default
-  namespace: oran-o2ims
-spec:
-  cloudID: {{ ocloud_platform_o2ims_ingress_host | to_uuid }}
-  ingressHost: {{ ocloud_platform_o2ims_ingress_host }}
-  alarmServerConfig:
-    enabled: false
-  metadataServerConfig:
-    enabled: true
-  deploymentManagerServerConfig:
-    enabled: true
-    backendURL: "{{ ocloud_platform_o2ims_api_url }}"
-    backendType: regular-hub
-  resourceServerConfig:
-    enabled: true
-    backendURL: "{{ocloud_platform_o2ims_search_api_url }}"
diff --git a/okd/roles/ocloud_platform_okd/defaults/main.yml b/okd/roles/ocloud_platform_okd/defaults/main.yml
index 587e4190..7959d871 100644
--- a/okd/roles/ocloud_platform_okd/defaults/main.yml
+++ b/okd/roles/ocloud_platform_okd/defaults/main.yml
@@ -2,7 +2,6 @@
 ocloud_platform_okd_pull_secret: '{"auths":{"fake":{"auth":"aWQ6cGFzcwo="}}}'
 ocloud_platform_okd_ssh_pubkey: ~
 ocloud_platform_okd_kubeconfig: ~
-ocloud_platform_okd_release: "4.16.0-0.okd-scos-2024-08-01-132038"
+ocloud_platform_okd_release: "4.19.0-okd-scos.0"
 ocloud_platform_okd_base_url: "quay.io/okd/scos-release"
 ocloud_platform_okd_cli_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp"
-ocloud_platform_okd_image_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/dependencies/rhcos/4.16/4.16.3/rhcos-4.16.3-x86_64-live.x86_64.iso"
diff --git a/okd/roles/ocloud_platform_okd/handlers/main.yml b/okd/roles/ocloud_platform_okd/handlers/main.yml
index 2044f426..9f830a30 100644
--- a/okd/roles/ocloud_platform_okd/handlers/main.yml
+++ b/okd/roles/ocloud_platform_okd/handlers/main.yml
@@ -1,9 +1,9 @@
 ---
 - name: Monitor OKD platform deployment
   ansible.builtin.command:
-    cmd: "openshift-install agent wait-for {{ item }} --log-level=info --dir {{ ocloud_platform_okd_staging_dir['path'] }}/cfg"
+    cmd: "openshift-install agent wait-for {{ item }} --log-level=info --dir {{ ocloud_staging_dir['path'] }}/cfg"
   environment:
-    PATH: "{{ ocloud_platform_okd_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
+    PATH: "{{ ocloud_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
   loop:
     - bootstrap-complete
     - install-complete
diff --git a/okd/roles/ocloud_platform_okd/meta/main.yml b/okd/roles/ocloud_platform_okd/meta/main.yml
new file mode 100644
index 00000000..5b478055
--- /dev/null
+++ b/okd/roles/ocloud_platform_okd/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: ocloud_setup
diff --git a/okd/roles/ocloud_platform_okd/tasks/install.yml b/okd/roles/ocloud_platform_okd/tasks/install.yml
index 36b0bbd3..c1aed4ab 100644
--- a/okd/roles/ocloud_platform_okd/tasks/install.yml
+++ b/okd/roles/ocloud_platform_okd/tasks/install.yml
@@ -1,39 +1,14 @@
 ---
-- name: Create staging dir for OKD installation
-  ansible.builtin.tempfile:
-    state: directory
-  register: ocloud_platform_okd_staging_dir
-
-- name: Create staging subdirs
-  ansible.builtin.file:
-    path: "{{ ocloud_platform_okd_staging_dir['path'] }}/{{ item }}"
-    state: directory
-  loop:
-    - bin
-    - cfg
-    - cfg/openshift
-
-- name: Download OKD CLI
-  ansible.builtin.get_url:
-    url: "{{ ocloud_platform_okd_cli_url }}/stable-{{ ocloud_platform_okd_release | regex_search('^[0-9]*\\.[0-9]*') }}/openshift-client-linux.tar.gz"
-    dest: "{{ ocloud_platform_okd_staging_dir['path'] }}"
-
-- name: Extract OKD CLI
-  ansible.builtin.unarchive:
-    src: "{{ ocloud_platform_okd_staging_dir['path'] }}/openshift-client-linux.tar.gz"
-    dest: "{{ ocloud_platform_okd_staging_dir['path'] }}/bin"
-    remote_src: true
-
 - name: Extract OKD installer
   ansible.builtin.shell:
-    cmd: "oc adm release extract --command=openshift-install {{ ocloud_platform_okd_base_url }}:{{ ocloud_platform_okd_release }} --to {{ ocloud_platform_okd_staging_dir['path'] }}/bin"
+    cmd: "oc adm release extract --command=openshift-install {{ ocloud_platform_okd_base_url }}:{{ ocloud_platform_okd_release }} --to {{ ocloud_staging_dir['path'] }}/bin"
   environment:
-    PATH: "{{ ocloud_platform_okd_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
+    PATH: "{{ ocloud_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
 
 - name: Template OKD configs
   ansible.builtin.template:
     src: "{{ item }}.j2"
-    dest: "{{ ocloud_platform_okd_staging_dir['path'] }}/cfg/{{ item }}"
+    dest: "{{ ocloud_staging_dir['path'] }}/cfg/{{ item }}"
   loop:
     - agent-config.yaml
     - install-config.yaml
@@ -41,31 +16,30 @@
 - name: Copy MachineConfig manifests
   ansible.builtin.template:
     src: "{{ item }}.j2"
-    dest: "{{ ocloud_platform_okd_staging_dir['path'] }}/cfg/openshift/{{ item }}"
+    dest: "{{ ocloud_staging_dir['path'] }}/cfg/openshift/{{ item }}"
   loop:
     - 99-master-pvs.yaml
 
 - ansible.builtin.debug:
     verbosity: 2
-    msg: "{{ lookup('file', [ocloud_platform_okd_staging_dir['path'], 'cfg', item] | path_join) }}"
+    msg: "{{ lookup('file', [ocloud_staging_dir['path'], 'cfg', item] | path_join) }}"
   loop:
     - agent-config.yaml
     - install-config.yaml
 
 - name: Generate OKD agent-based installer image
   ansible.builtin.shell:
-    cmd: "openshift-install agent create image --dir {{ ocloud_platform_okd_staging_dir['path'] }}/cfg"
+    cmd: "openshift-install agent create image --dir {{ ocloud_staging_dir['path'] }}/cfg"
   environment:
-    PATH: "{{ ocloud_platform_okd_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
-    OPENSHIFT_INSTALL_OS_IMAGE_OVERRIDE: "{{ ocloud_platform_okd_image_url }}"
+    PATH: "{{ ocloud_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
 
 - debug:
     msg: |
-       OKD agent-based installer image has been created as {{ ocloud_platform_okd_staging_dir['path'] }}/cfg/agent.x86_64.iso
-       kubeconfig and kubeadmin-password can be found under {{ ocloud_platform_okd_staging_dir['path'] }}/cfg/auth/
+       OKD agent-based installer image has been created as {{ ocloud_staging_dir['path'] }}/cfg/agent.x86_64.iso
+       kubeconfig and kubeadmin-password can be found under {{ ocloud_staging_dir['path'] }}/cfg/auth/
 
 - ansible.builtin.set_fact:
-    ocloud_platform_okd_kubeconfig: "{{ ocloud_platform_okd_staging_dir['path'] }}/cfg/auth/kubeconfig"
+    ocloud_platform_okd_kubeconfig: "{{ ocloud_staging_dir['path'] }}/cfg/auth/kubeconfig"
 
 - ansible.builtin.set_fact:
-    ocloud_platform_image: "{{ ocloud_platform_okd_staging_dir['path'] }}/cfg/agent.x86_64.iso"
+    ocloud_platform_image: "{{ ocloud_staging_dir['path'] }}/cfg/agent.x86_64.iso"
diff --git a/okd/roles/ocloud_platform_okd/tasks/main.yml b/okd/roles/ocloud_platform_okd/tasks/main.yml
index 3b00e37e..52df9287 100644
--- a/okd/roles/ocloud_platform_okd/tasks/main.yml
+++ b/okd/roles/ocloud_platform_okd/tasks/main.yml
@@ -1,8 +1,4 @@
 ---
-- name: Gather facts
-  ansible.builtin.setup:
-    gather_subset: all
-
 - include_tasks: version.yml
   when: ocloud_platform_okd_kubeconfig
 
diff --git a/okd/roles/ocloud_platform_siteconfig/defaults/main.yml b/okd/roles/ocloud_platform_siteconfig/defaults/main.yml
index 925e9dd8..1d282efe 100644
--- a/okd/roles/ocloud_platform_siteconfig/defaults/main.yml
+++ b/okd/roles/ocloud_platform_siteconfig/defaults/main.yml
@@ -1,4 +1,4 @@
 ---
 ocloud_platform_siteconfig_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}"
-ocloud_platform_siteconfig_snapshot: "2.14.0-SNAPSHOT-2025-03-24-21-08-55"
+ocloud_platform_siteconfig_snapshot: "2.14.0-SNAPSHOT-2025-05-19-21-04-46"
 ocloud_platform_siteconfig_repo_url: "https://github.com/stolostron/siteconfig.git"
diff --git a/okd/roles/ocloud_platform_siteconfig/tasks/main.yml b/okd/roles/ocloud_platform_siteconfig/tasks/main.yml
index 9566fa2e..656e22a3 100644
--- a/okd/roles/ocloud_platform_siteconfig/tasks/main.yml
+++ b/okd/roles/ocloud_platform_siteconfig/tasks/main.yml
@@ -11,3 +11,16 @@
   environment:
     PATH: "{{ ocloud_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}"
     KUBECONFIG: "{{ ocloud_platform_siteconfig_kubeconfig }}"
+
+- name: Enable siteconfig
+  kubernetes.core.k8s_json_patch:
+    name: multiclusterhub
+    kind: MultiClusterHub
+    namespace: open-cluster-management
+    kubeconfig: "{{ ocloud_platform_siteconfig_kubeconfig }}"
+    patch:
+      - op: add
+        path: "/spec/overrides/components/-"
+        value:
+          name: siteconfig
+          enabled: true
diff --git a/okd/roles/ocloud_platform_stolostron/defaults/main.yml b/okd/roles/ocloud_platform_stolostron/defaults/main.yml
index deec31d6..22eb0d5b 100644
--- a/okd/roles/ocloud_platform_stolostron/defaults/main.yml
+++ b/okd/roles/ocloud_platform_stolostron/defaults/main.yml
@@ -1,6 +1,5 @@
 ---
 ocloud_platform_stolostron_pull_secret: "{{ ocloud_platform_okd_pull_secret }}"
 ocloud_platform_stolostron_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}"
-ocloud_platform_stolostron_snapshot: "2.11.2-SNAPSHOT-2024-08-27-14-52-55"
+ocloud_platform_stolostron_snapshot: "2.14.0-SNAPSHOT-2025-05-19-21-04-46"
 ocloud_platform_stolostron_repo_url: "https://github.com/stolostron/deploy.git"
-ocloud_platform_stolostron_yq_url: "https://github.com/mikefarah/yq/releases/download/v4.45.1/yq_linux_amd64"
diff --git a/okd/roles/ocloud_platform_stolostron/meta/main.yml b/okd/roles/ocloud_platform_stolostron/meta/main.yml
new file mode 100644
index 00000000..5b478055
--- /dev/null
+++ b/okd/roles/ocloud_platform_stolostron/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - role: ocloud_setup
diff --git a/okd/roles/ocloud_platform_stolostron/tasks/main.yml b/okd/roles/ocloud_platform_stolostron/tasks/main.yml
index afe3185e..3ed96e2c 100644
--- a/okd/roles/ocloud_platform_stolostron/tasks/main.yml
+++ b/okd/roles/ocloud_platform_stolostron/tasks/main.yml
@@ -1,8 +1,4 @@
 ---
-- name: Gather facts
-  ansible.builtin.setup:
-    gather_subset: all
-
 - name: Disable default catalog sources
   kubernetes.core.k8s:
     api_version: config.openshift.io/v1
@@ -15,57 +11,27 @@
         disableAllDefaultSources: true
     kubeconfig: "{{ ocloud_platform_stolostron_kubeconfig }}"
 
-- name: Create staging dir for Stolostron installation
-  ansible.builtin.tempfile:
-    state: directory
-  register: ocloud_platform_stolostron_staging_dir
-
-- name: Create staging subdirs
-  ansible.builtin.file:
-    path: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/{{ item }}"
-    state: directory
-  loop:
-    - bin
-    - git
-
-- name: Download OKD CLI
-  ansible.builtin.get_url:
-    url: "{{ ocloud_platform_okd_cli_url }}/stable-{{ ocloud_platform_okd_release | regex_search('^[0-9]*\\.[0-9]*') }}/openshift-client-linux.tar.gz"
-    dest: "{{ ocloud_platform_stolostron_staging_dir['path'] }}"
-
-- name: Extract OKD CLI
-  ansible.builtin.unarchive:
-    src: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/openshift-client-linux.tar.gz"
-    dest: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/bin"
-    remote_src: true
-
-- name: Download yq
-  ansible.builtin.get_url:
-    url: "{{ ocloud_platform_stolostron_yq_url }}"
-    dest: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/bin/yq"
-    mode: '0555'
-
 - name: Clone stolostron/deploy repo
   ansible.builtin.git:
     repo: "{{ ocloud_platform_stolostron_repo_url }}"
-    dest: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/git"
+    dest: "{{ ocloud_staging_dir['path'] }}/git/stolostron-deploy"
 
 - name: Template pull secret
   ansible.builtin.template:
     src: "pull-secret.yaml.j2"
-    dest: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/git/prereqs/pull-secret.yaml"
+    dest: "{{ ocloud_staging_dir['path'] }}/git/stolostron-deploy/prereqs/pull-secret.yaml"
 
 - name: Template snapshot version
   ansible.builtin.template:
     src: "snapshot.ver.j2"
-    dest: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/git/snapshot.ver"
+    dest: "{{ ocloud_staging_dir['path'] }}/git/stolostron-deploy/snapshot.ver"
 
 - name: Install stolostron
   ansible.builtin.shell:
-    chdir: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/git"
+    chdir: "{{ ocloud_staging_dir['path'] }}/git/stolostron-deploy"
     cmd: "./start.sh --silent --watch --search"
   environment:
-    PATH: "{{ ocloud_platform_stolostron_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
+    PATH: "{{ ocloud_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}"
     KUBECONFIG: "{{ ocloud_platform_stolostron_kubeconfig }}"
 
 - name: Create search-api route
diff --git a/okd/roles/ocloud_setup/defaults/main.yml b/okd/roles/ocloud_setup/defaults/main.yml
index 0ee983cc..f598eb5e 100644
--- a/okd/roles/ocloud_setup/defaults/main.yml
+++ b/okd/roles/ocloud_setup/defaults/main.yml
@@ -2,3 +2,4 @@
 ocloud_setup_okd_cli_version: "stable-4.18"
 ocloud_setup_okd_cli_url: "https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp"
 ocloud_setup_golang_url: "https://go.dev/dl/go1.23.2.linux-amd64.tar.gz"
+ocloud_setup_yq_url: "https://github.com/mikefarah/yq/releases/download/v4.45.1/yq_linux_amd64"
diff --git a/okd/roles/ocloud_setup/tasks/main.yml b/okd/roles/ocloud_setup/tasks/main.yml
index a8c6565e..48f65fa2 100644
--- a/okd/roles/ocloud_setup/tasks/main.yml
+++ b/okd/roles/ocloud_setup/tasks/main.yml
@@ -17,6 +17,7 @@
   loop:
     - bin
     - cfg
+    - cfg/openshift
     - git
 
 - include_tasks: okd.yml
diff --git a/okd/roles/ocloud_setup/tasks/okd.yml b/okd/roles/ocloud_setup/tasks/okd.yml
index 3d51a048..47a91e8a 100644
--- a/okd/roles/ocloud_setup/tasks/okd.yml
+++ b/okd/roles/ocloud_setup/tasks/okd.yml
@@ -20,3 +20,10 @@
     src: "{{ ocloud_staging_dir['path'] }}/go.linux-amd64.tar.gz"
     dest: "{{ ocloud_staging_dir['path'] }}"
     remote_src: true
+
+- name: Download yq
+  ansible.builtin.get_url:
+    url: "{{ ocloud_setup_yq_url }}"
+    dest: "{{ ocloud_staging_dir['path'] }}/bin/yq"
+    mode: '0555'
+