From 5c97953893db426bcdcd670c8ea8137dd16a7a1c Mon Sep 17 00:00:00 2001 From: Chris Wheeler Date: Sat, 7 Jun 2025 23:00:15 +0000 Subject: [PATCH] Added ocloud_platform_hwmgr role and updated ocloud_platform_* roles - Added ocloud_platform_hwmgr role to install oran-hwmgr-plugin - Updated repo version to "osc-l-release" in the ocloud_platform_o2ims role - Standardized variable naming in several roles to use "ocloud_kubeconfig" Change-Id: I6c3aee6007efbdf0080cdf7db4583526ea2ff4ce Signed-Off-By: Chris Wheeler Issue-ID: INF-490 --- okd/roles/ocloud/tasks/main.yml | 6 ++++++ okd/roles/ocloud_platform_cgu/defaults/main.yml | 2 +- okd/roles/ocloud_platform_cgu/tasks/main.yml | 2 +- okd/roles/ocloud_platform_hwmgr/defaults/main.yml | 4 ++++ okd/roles/ocloud_platform_hwmgr/meta/main.yml | 3 +++ okd/roles/ocloud_platform_hwmgr/tasks/main.yml | 14 ++++++++++++++ okd/roles/ocloud_platform_mco/defaults/main.yml | 2 +- okd/roles/ocloud_platform_mco/tasks/main.yml | 18 +++++++++--------- okd/roles/ocloud_platform_o2ims/defaults/main.yml | 4 ++-- okd/roles/ocloud_platform_o2ims/tasks/main.yml | 2 +- okd/roles/ocloud_platform_okd/defaults/main.yml | 2 +- okd/roles/ocloud_platform_okd/tasks/install.yml | 2 +- okd/roles/ocloud_platform_okd/tasks/main.yml | 2 +- okd/roles/ocloud_platform_okd/tasks/version.yml | 2 +- okd/roles/ocloud_platform_siteconfig/defaults/main.yml | 2 +- okd/roles/ocloud_platform_siteconfig/tasks/main.yml | 4 ++-- okd/roles/ocloud_platform_stolostron/defaults/main.yml | 2 +- okd/roles/ocloud_platform_stolostron/tasks/main.yml | 6 +++--- 18 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 okd/roles/ocloud_platform_hwmgr/defaults/main.yml create mode 100644 okd/roles/ocloud_platform_hwmgr/meta/main.yml create mode 100644 okd/roles/ocloud_platform_hwmgr/tasks/main.yml diff --git a/okd/roles/ocloud/tasks/main.yml b/okd/roles/ocloud/tasks/main.yml index c52293e4..c9b81a69 100644 --- a/okd/roles/ocloud/tasks/main.yml +++ b/okd/roles/ocloud/tasks/main.yml @@ -48,3 +48,9 @@ name: "ocloud_platform_o2ims" delegate_to: "{{ groups['deployer'][0] }}" when: ocloud_platform == "okd" + +- name: Include platform role - oran-hwmgr-plugin + ansible.builtin.import_role: + name: "ocloud_platform_hwmgr" + delegate_to: "{{ groups['deployer'][0] }}" + when: ocloud_platform == "okd" diff --git a/okd/roles/ocloud_platform_cgu/defaults/main.yml b/okd/roles/ocloud_platform_cgu/defaults/main.yml index 7467a064..09674e34 100644 --- a/okd/roles/ocloud_platform_cgu/defaults/main.yml +++ b/okd/roles/ocloud_platform_cgu/defaults/main.yml @@ -1,4 +1,4 @@ --- -ocloud_platform_cgu_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}" +ocloud_kubeconfig: ~ ocloud_platform_cgu_version: "4.19.0" ocloud_platform_cgu_repo_url: "https://github.com/openshift-kni/cluster-group-upgrades-operator.git" diff --git a/okd/roles/ocloud_platform_cgu/tasks/main.yml b/okd/roles/ocloud_platform_cgu/tasks/main.yml index d1b19a05..e30982fe 100644 --- a/okd/roles/ocloud_platform_cgu/tasks/main.yml +++ b/okd/roles/ocloud_platform_cgu/tasks/main.yml @@ -10,4 +10,4 @@ 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 }}" + KUBECONFIG: "{{ ocloud_kubeconfig }}" diff --git a/okd/roles/ocloud_platform_hwmgr/defaults/main.yml b/okd/roles/ocloud_platform_hwmgr/defaults/main.yml new file mode 100644 index 00000000..42eb75a5 --- /dev/null +++ b/okd/roles/ocloud_platform_hwmgr/defaults/main.yml @@ -0,0 +1,4 @@ +--- +ocloud_kubeconfig: ~ +ocloud_platform_hwmgr_repo_url: "https://github.com/openshift-kni/oran-hwmgr-plugin.git" +ocloud_platform_hwmgr_repo_version: "main" diff --git a/okd/roles/ocloud_platform_hwmgr/meta/main.yml b/okd/roles/ocloud_platform_hwmgr/meta/main.yml new file mode 100644 index 00000000..5b478055 --- /dev/null +++ b/okd/roles/ocloud_platform_hwmgr/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: ocloud_setup diff --git a/okd/roles/ocloud_platform_hwmgr/tasks/main.yml b/okd/roles/ocloud_platform_hwmgr/tasks/main.yml new file mode 100644 index 00000000..f982222d --- /dev/null +++ b/okd/roles/ocloud_platform_hwmgr/tasks/main.yml @@ -0,0 +1,14 @@ +--- +- name: Clone oran-hwmgr-plugin repo + ansible.builtin.git: + repo: "{{ ocloud_platform_hwmgr_repo_url }}" + version: "{{ ocloud_platform_hwmgr_repo_version }}" + dest: "{{ ocloud_staging_dir['path'] }}/git/oran-hwmgr-plugin" + +- name: Install oran-hwmgr-plugin + ansible.builtin.shell: + chdir: "{{ ocloud_staging_dir['path'] }}/git/oran-hwmgr-plugin" + cmd: "make install deploy" + environment: + PATH: "{{ ocloud_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}" + KUBECONFIG: "{{ ocloud_kubeconfig }}" diff --git a/okd/roles/ocloud_platform_mco/defaults/main.yml b/okd/roles/ocloud_platform_mco/defaults/main.yml index 58af2184..7bfb5e65 100644 --- a/okd/roles/ocloud_platform_mco/defaults/main.yml +++ b/okd/roles/ocloud_platform_mco/defaults/main.yml @@ -1,5 +1,5 @@ --- -ocloud_platform_mco_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}" +ocloud_kubeconfig: ~ ocloud_platform_mco_pull_secret: "{{ ocloud_platform_okd_pull_secret }}" ocloud_platform_mco_namespace: "open-cluster-management-observability" ocloud_platform_mco_minio_image: "quay.io/minio/minio:RELEASE.2021-08-25T00-41-18Z" diff --git a/okd/roles/ocloud_platform_mco/tasks/main.yml b/okd/roles/ocloud_platform_mco/tasks/main.yml index ec6e28ee..b01af6fa 100644 --- a/okd/roles/ocloud_platform_mco/tasks/main.yml +++ b/okd/roles/ocloud_platform_mco/tasks/main.yml @@ -8,19 +8,19 @@ kind: Namespace name: "{{ ocloud_platform_mco_namespace }}" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Create StorageClass kubernetes.core.k8s: template: "sc.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Create PersistentVolumes kubernetes.core.k8s: template: "pv.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" loop: "{{ groups['ocloud'] }}" when: hostvars[item]['role'] == "master" @@ -28,7 +28,7 @@ kubernetes.core.k8s: template: "pull-secret.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Generate S3 access and secret keys set_fact: @@ -39,28 +39,28 @@ kubernetes.core.k8s: template: "pvc.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Create Secret kubernetes.core.k8s: template: "secret.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Create Deployment - minio kubernetes.core.k8s: template: "deployment.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Create Service - minio kubernetes.core.k8s: template: "service.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Create MultiClusterObservability resource kubernetes.core.k8s: template: "mco.yaml.j2" state: present - kubeconfig: "{{ ocloud_platform_mco_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" diff --git a/okd/roles/ocloud_platform_o2ims/defaults/main.yml b/okd/roles/ocloud_platform_o2ims/defaults/main.yml index 85034c36..3e3e4c44 100644 --- a/okd/roles/ocloud_platform_o2ims/defaults/main.yml +++ b/okd/roles/ocloud_platform_o2ims/defaults/main.yml @@ -1,4 +1,4 @@ --- -ocloud_platform_o2ims_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}" +ocloud_kubeconfig: ~ ocloud_platform_o2ims_repo_url: "https://github.com/openshift-kni/oran-o2ims.git" -ocloud_platform_o2ims_repo_version: "main" +ocloud_platform_o2ims_repo_version: "osc-l-release" diff --git a/okd/roles/ocloud_platform_o2ims/tasks/main.yml b/okd/roles/ocloud_platform_o2ims/tasks/main.yml index 4af58c26..8c9c20b9 100644 --- a/okd/roles/ocloud_platform_o2ims/tasks/main.yml +++ b/okd/roles/ocloud_platform_o2ims/tasks/main.yml @@ -11,4 +11,4 @@ cmd: "make install deploy" environment: PATH: "{{ ocloud_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}" - KUBECONFIG: "{{ ocloud_platform_o2ims_kubeconfig }}" + KUBECONFIG: "{{ ocloud_kubeconfig }}" diff --git a/okd/roles/ocloud_platform_okd/defaults/main.yml b/okd/roles/ocloud_platform_okd/defaults/main.yml index 7959d871..8e2ff134 100644 --- a/okd/roles/ocloud_platform_okd/defaults/main.yml +++ b/okd/roles/ocloud_platform_okd/defaults/main.yml @@ -1,7 +1,7 @@ --- ocloud_platform_okd_pull_secret: '{"auths":{"fake":{"auth":"aWQ6cGFzcwo="}}}' ocloud_platform_okd_ssh_pubkey: ~ -ocloud_platform_okd_kubeconfig: ~ +ocloud_kubeconfig: ~ 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" diff --git a/okd/roles/ocloud_platform_okd/tasks/install.yml b/okd/roles/ocloud_platform_okd/tasks/install.yml index c1aed4ab..287b010a 100644 --- a/okd/roles/ocloud_platform_okd/tasks/install.yml +++ b/okd/roles/ocloud_platform_okd/tasks/install.yml @@ -39,7 +39,7 @@ kubeconfig and kubeadmin-password can be found under {{ ocloud_staging_dir['path'] }}/cfg/auth/ - ansible.builtin.set_fact: - ocloud_platform_okd_kubeconfig: "{{ ocloud_staging_dir['path'] }}/cfg/auth/kubeconfig" + ocloud_kubeconfig: "{{ ocloud_staging_dir['path'] }}/cfg/auth/kubeconfig" - ansible.builtin.set_fact: 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 52df9287..43873d46 100644 --- a/okd/roles/ocloud_platform_okd/tasks/main.yml +++ b/okd/roles/ocloud_platform_okd/tasks/main.yml @@ -1,6 +1,6 @@ --- - include_tasks: version.yml - when: ocloud_platform_okd_kubeconfig + when: ocloud_kubeconfig - include_tasks: install.yml when: ocloud_platform_okd_installed_release != ocloud_platform_okd_release diff --git a/okd/roles/ocloud_platform_okd/tasks/version.yml b/okd/roles/ocloud_platform_okd/tasks/version.yml index 5aa0c3dd..1dcfb534 100644 --- a/okd/roles/ocloud_platform_okd/tasks/version.yml +++ b/okd/roles/ocloud_platform_okd/tasks/version.yml @@ -3,7 +3,7 @@ kubernetes.core.k8s_info: api_version: config.openshift.io/v1 kind: ClusterVersion - kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" register: ocloud_platform_okd_cluster_info - name: Set OKD installed release diff --git a/okd/roles/ocloud_platform_siteconfig/defaults/main.yml b/okd/roles/ocloud_platform_siteconfig/defaults/main.yml index 1d282efe..af7763f6 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_kubeconfig: ~ 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 656e22a3..36ceceae 100644 --- a/okd/roles/ocloud_platform_siteconfig/tasks/main.yml +++ b/okd/roles/ocloud_platform_siteconfig/tasks/main.yml @@ -10,14 +10,14 @@ cmd: "make install deploy VERSION={{ ocloud_platform_siteconfig_snapshot }}" environment: PATH: "{{ ocloud_staging_dir['path'] }}/go/bin:{{ ansible_env.PATH }}" - KUBECONFIG: "{{ ocloud_platform_siteconfig_kubeconfig }}" + KUBECONFIG: "{{ ocloud_kubeconfig }}" - name: Enable siteconfig kubernetes.core.k8s_json_patch: name: multiclusterhub kind: MultiClusterHub namespace: open-cluster-management - kubeconfig: "{{ ocloud_platform_siteconfig_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" patch: - op: add path: "/spec/overrides/components/-" diff --git a/okd/roles/ocloud_platform_stolostron/defaults/main.yml b/okd/roles/ocloud_platform_stolostron/defaults/main.yml index 22eb0d5b..33c84af4 100644 --- a/okd/roles/ocloud_platform_stolostron/defaults/main.yml +++ b/okd/roles/ocloud_platform_stolostron/defaults/main.yml @@ -1,5 +1,5 @@ --- ocloud_platform_stolostron_pull_secret: "{{ ocloud_platform_okd_pull_secret }}" -ocloud_platform_stolostron_kubeconfig: "{{ ocloud_platform_okd_kubeconfig }}" +ocloud_kubeconfig: ~ 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" diff --git a/okd/roles/ocloud_platform_stolostron/tasks/main.yml b/okd/roles/ocloud_platform_stolostron/tasks/main.yml index 3ed96e2c..4a2e9f0e 100644 --- a/okd/roles/ocloud_platform_stolostron/tasks/main.yml +++ b/okd/roles/ocloud_platform_stolostron/tasks/main.yml @@ -9,7 +9,7 @@ definition: spec: disableAllDefaultSources: true - kubeconfig: "{{ ocloud_platform_stolostron_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" - name: Clone stolostron/deploy repo ansible.builtin.git: @@ -32,7 +32,7 @@ cmd: "./start.sh --silent --watch --search" environment: PATH: "{{ ocloud_staging_dir['path'] }}/bin:{{ ansible_env.PATH }}" - KUBECONFIG: "{{ ocloud_platform_stolostron_kubeconfig }}" + KUBECONFIG: "{{ ocloud_kubeconfig }}" - name: Create search-api route kubernetes.core.k8s: @@ -48,4 +48,4 @@ to: kind: Service name: search-search-api - kubeconfig: "{{ ocloud_platform_stolostron_kubeconfig }}" + kubeconfig: "{{ ocloud_kubeconfig }}" -- 2.16.6