From de34312d087c591961e9ddcb75764c035a0fce93 Mon Sep 17 00:00:00 2001 From: Billy Bethell <93923166+bbethell-1@users.noreply.github.com> Date: Wed, 3 Apr 2024 20:29:38 +0100 Subject: [PATCH 1/5] Create ocp4_workload_rhdh --- ansible/roles_ocp_workloads/ocp4_workload_rhdh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 ansible/roles_ocp_workloads/ocp4_workload_rhdh diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhdh b/ansible/roles_ocp_workloads/ocp4_workload_rhdh new file mode 100644 index 00000000000..2d19c818d37 --- /dev/null +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhdh @@ -0,0 +1,17 @@ +--- +- name: Install OpenShift GitOps operator + ansible.builtin.include_role: + name: install_operator + vars: + install_operator_action: install + install_operator_name: openshift-gitops-operator + install_operator_namespace: openshift-operators + install_operator_channel: "{{ ocp4_workload_openshift_gitops_channel }}" + install_operator_catalog: redhat-operators + install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_gitops_automatic_install_plan_approval | default(true) }}" + install_operator_starting_csv: "{{ ocp4_workload_openshift_gitops_starting_csv }}" + install_operator_catalogsource_setup: "{{ ocp4_workload_openshift_gitops_use_catalog_snapshot | default(false) }}" + install_operator_catalogsource_name: "{{ ocp4_workload_openshift_gitops_catalogsource_name | default('') }}" + install_operator_catalogsource_namespace: openshift-operators + install_operator_catalogsource_image: "{{ ocp4_workload_openshift_gitops_catalog_snapshot_image | default('') }}" + install_operator_catalogsource_image_tag: "{{ ocp4_workload_openshift_gitops_catalog_snapshot_image_tag | default('') }}" From 6e9a430a82c2e905538c12fdd12a6a7fa23e766b Mon Sep 17 00:00:00 2001 From: Billy Bethell <93923166+bbethell-1@users.noreply.github.com> Date: Wed, 3 Apr 2024 20:32:50 +0100 Subject: [PATCH 2/5] Update ocp4_workload_rhdh --- ansible/roles_ocp_workloads/ocp4_workload_rhdh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhdh b/ansible/roles_ocp_workloads/ocp4_workload_rhdh index 2d19c818d37..395899ab8ab 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhdh +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhdh @@ -1,12 +1,12 @@ --- -- name: Install OpenShift GitOps operator +- name: Install Red Hat Developer Hub Operator ansible.builtin.include_role: name: install_operator vars: install_operator_action: install - install_operator_name: openshift-gitops-operator + install_operator_name: red-hat-developer-hub-operator install_operator_namespace: openshift-operators - install_operator_channel: "{{ ocp4_workload_openshift_gitops_channel }}" + install_operator_channel: fast install_operator_catalog: redhat-operators install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_gitops_automatic_install_plan_approval | default(true) }}" install_operator_starting_csv: "{{ ocp4_workload_openshift_gitops_starting_csv }}" From 9910a5fe949180b5073e521543c55044704a498a Mon Sep 17 00:00:00 2001 From: Billy Bethell <93923166+bbethell-1@users.noreply.github.com> Date: Wed, 3 Apr 2024 20:37:38 +0100 Subject: [PATCH 3/5] Update ocp4_workload_rhdh --- ansible/roles_ocp_workloads/ocp4_workload_rhdh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhdh b/ansible/roles_ocp_workloads/ocp4_workload_rhdh index 395899ab8ab..5ee3b56c1e4 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhdh +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhdh @@ -8,10 +8,8 @@ install_operator_namespace: openshift-operators install_operator_channel: fast install_operator_catalog: redhat-operators - install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_gitops_automatic_install_plan_approval | default(true) }}" - install_operator_starting_csv: "{{ ocp4_workload_openshift_gitops_starting_csv }}" - install_operator_catalogsource_setup: "{{ ocp4_workload_openshift_gitops_use_catalog_snapshot | default(false) }}" - install_operator_catalogsource_name: "{{ ocp4_workload_openshift_gitops_catalogsource_name | default('') }}" + install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_rhdh_automatic_install_plan_approval | default(true) }}" + install_operator_starting_csv: red-hat-developer-hub-operator.v1.1.0 + install_operator_catalogsource_setup: "{{ ocp4_workload_openshift_rhdh_use_catalog_snapshot | default(false) }}" + install_operator_catalogsource_name: "{{ ocp4_workload_openshift_rhdh_catalogsource_name | default('') }}" install_operator_catalogsource_namespace: openshift-operators - install_operator_catalogsource_image: "{{ ocp4_workload_openshift_gitops_catalog_snapshot_image | default('') }}" - install_operator_catalogsource_image_tag: "{{ ocp4_workload_openshift_gitops_catalog_snapshot_image_tag | default('') }}" From 87d1628a03ac4529482e45296bab4ace6aaeb6c1 Mon Sep 17 00:00:00 2001 From: Billy Bethell <93923166+bbethell-1@users.noreply.github.com> Date: Wed, 3 Apr 2024 20:45:57 +0100 Subject: [PATCH 4/5] Update ocp4_workload_rhdh --- ansible/roles_ocp_workloads/ocp4_workload_rhdh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhdh b/ansible/roles_ocp_workloads/ocp4_workload_rhdh index 5ee3b56c1e4..97ea3902f5e 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhdh +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhdh @@ -10,6 +10,8 @@ install_operator_catalog: redhat-operators install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_rhdh_automatic_install_plan_approval | default(true) }}" install_operator_starting_csv: red-hat-developer-hub-operator.v1.1.0 - install_operator_catalogsource_setup: "{{ ocp4_workload_openshift_rhdh_use_catalog_snapshot | default(false) }}" - install_operator_catalogsource_name: "{{ ocp4_workload_openshift_rhdh_catalogsource_name | default('') }}" + install_operator_catalogsource_setup: "{{ ocp4_workload_rhdh_use_catalog_snapshot | default(false) }}" + install_operator_catalogsource_name: "{{ ocp4_workload_rhdh_catalogsource_name | default('') }}" install_operator_catalogsource_namespace: openshift-operators + install_operator_catalogsource_image: "{{ ocp4_workload_rhdh_catalog_snapshot_image | default('') }}" + install_operator_catalogsource_image_tag: "{{ ocp4_workload_rhdh_catalog_snapshot_image_tag | default('') }}" From d4e084bf8c3405770118c67465a45b186ab3e6bb Mon Sep 17 00:00:00 2001 From: Billy Bethell <93923166+bbethell-1@users.noreply.github.com> Date: Fri, 5 Apr 2024 14:01:51 +0100 Subject: [PATCH 5/5] Update ocp4_workload_rhdh --- .../roles_ocp_workloads/ocp4_workload_rhdh | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhdh b/ansible/roles_ocp_workloads/ocp4_workload_rhdh index 97ea3902f5e..28599abf20b 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhdh +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhdh @@ -1,17 +1,31 @@ --- +# Implement your Workload deployment tasks here +- name: Setting up workload for user + debug: + msg: "Setting up workload for user ocp_username = admin" + + - name: Install Red Hat Developer Hub Operator ansible.builtin.include_role: name: install_operator vars: install_operator_action: install - install_operator_name: red-hat-developer-hub-operator - install_operator_namespace: openshift-operators + install_operator_name: rhdh + install_operator_namespace: rhdh-operator install_operator_channel: fast install_operator_catalog: redhat-operators - install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_rhdh_automatic_install_plan_approval | default(true) }}" - install_operator_starting_csv: red-hat-developer-hub-operator.v1.1.0 - install_operator_catalogsource_setup: "{{ ocp4_workload_rhdh_use_catalog_snapshot | default(false) }}" - install_operator_catalogsource_name: "{{ ocp4_workload_rhdh_catalogsource_name | default('') }}" - install_operator_catalogsource_namespace: openshift-operators - install_operator_catalogsource_image: "{{ ocp4_workload_rhdh_catalog_snapshot_image | default('') }}" - install_operator_catalogsource_image_tag: "{{ ocp4_workload_rhdh_catalog_snapshot_image_tag | default('') }}" + install_operator_automatic_install_plan_approval: "{{ ocp4_workload_openshift_gitops_automatic_install_plan_approval | default(true) }}" + install_operator_starting_csv: rhdh-operator.v1.1.0 + install_operator_catalogsource_setup: false + ocp4_workload_openshift_rhdh_use_catalog_snapshot: false + install_operator_catalogsource_name: redhat-operators-snapshot-rhdh + install_operator_catalogsource_namespace: openshift-marketplace + install_operator_catalogsource_image: quay.io/gpte-devops-automation/olm_snapshot_redhat_catalog + install_operator_catalogsource_image_tag: v4.14_2024_04_01 + + +# Leave this as the last task in the playbook. +- name: workload tasks complete + debug: + msg: "Workload Tasks completed successfully." + when: not silent|bool