diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/defaults/main.yml index d8e967084f7..b69f36ef700 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/defaults/main.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/defaults/main.yml @@ -3,32 +3,22 @@ become_override: false ocp_username: opentlc-mgr silent: false -ocp4_workload_rhods_olm_install_operator_name: "opendatahub-operator" -ocp4_workload_rhods_olm_operator_subscription_channel: "stable" - -ocp4_workload_rhods_olm_odh_namespace: "opendatahub" -ocp4_workload_rhods_olm_applications_namespace: "redhat-ods-applications" -ocp4_workload_rhods_olm_monitoring_namespace: "redhat-ods-monitoring" +ocp4_workload_rhods_olm_install_operator_name: "managed-odh" +ocp4_workload_rhods_olm_operator_subscription_channel: "beta" +ocp4_workload_rhods_olm_odh_namespace: "redhat-ods-operator" ocp4_workload_rhods_olm_namespace_list: -- "openshift-operators" -- "{{ ocp4_workload_rhods_olm_odh_namespace }}" - "{{ ocp4_workload_rhods_olm_applications_namespace }}" - "{{ ocp4_workload_rhods_olm_monitoring_namespace }}" -ocp4_workload_rhods_olm_catalogsource_name: "redhat-operators-snapshot-opendatahub" -#didnt change namespace +ocp4_workload_rhods_olm_catalogsource_name: "addon-managed-odh-catalog" ocp4_workload_rhods_olm_catalogsource_namespace: "{{ ocp4_workload_rhods_olm_odh_namespace }}" -ocp4_workload_rhods_olm_catalogsource_display_name: "Open Data Hub Operator" -ocp4_workload_rhods_olm_catalog_snapshot_image: "quay.io/gpte-devops-automation/olm_snapshot_community_catalog" -ocp4_workload_rhods_olm_catalog_snapshot_image_tag: "v4.7_2021_08_02" - +ocp4_workload_rhods_olm_catalogsource_display_name: "Managed Open Data Hub Operator" +ocp4_workload_rhods_olm_catalog_snapshot_image: "quay.io/modh/qe-catalog-source" +ocp4_workload_rhods_olm_catalog_snapshot_image_tag: "integration-d446f68" ocp4_workload_rhods_olm_starting_csv: "" -# ocp4_workload_rhods_olm_starting_csv: "opendatahub-operator.1.0.14" -ocp4_workload_rhods_olm_pull_secret: "CHANGEME" -# used when you are conducting a workshop -# will cause user data to be output +ocp4_workload_rhods_olm_pull_secret: "CHANGEME" ocp4_workload_rhods_olm_is_workshop: false ocp4_workload_rhods_olm_workshop_num_users: 3 ocp4_workload_rhods_olm_workshop_username_base: "user" diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/remove_workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/remove_workload.yml index 5f0f4a5e971..42d1c8627da 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/remove_workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/remove_workload.yml @@ -1,6 +1,5 @@ --- # Implement your Workload deployment tasks here - - name: Find all KfDef instances k8s: state: absent @@ -11,7 +10,6 @@ loop: - { "name": "opendatahub", "namespace": "redhat-ods-applications"} - { "name": "monitoring", "namespace": "redhat-ods-monitoring"} - # Wait until all instances have been terminated - name: Wait for all opendatahub KfDef instance to be removed k8s_info: @@ -24,7 +22,6 @@ delay: 10 ignore_errors: true until: r_kfdef_odh.resources | length == 0 - - name: Wait for all monitoring KfDef instance to be removed k8s_info: api_version: kfdef.apps.kubeflow.org/v1 @@ -36,7 +33,6 @@ delay: 10 ignore_errors: true until: r_kfdef_mon.resources | length == 0 - - name: Remove RHODSOperator include_role: name: install_operator @@ -56,7 +52,7 @@ install_operator_catalogsource_image: "{{ ocp4_workload_rhods_olm_catalog_snapshot_image }}" install_operator_catalogsource_image_tag: "{{ ocp4_workload_rhods_olm_catalog_snapshot_image_tag }}" install_operator_catalogsource_pullsecrets: - - addon-odh-pullsecret + - addon-managed-odh-pullsecret # Delete Projects - name: Delete the projects diff --git a/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/workload.yml index 07ebed4eb83..22ffa1acaa1 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_rhods_olm/tasks/workload.yml @@ -25,19 +25,18 @@ vars: install_operator_action: install install_operator_name: rhods-operator - install_operator_namespace: "{{ ocp4_workload_rhods_olm_operator_namespace }}" + install_operator_namespace: "{{ ocp4_workload_rhods_olm_odh_namespace }}" install_operator_channel: "{{ ocp4_workload_rhods_olm_operator_subscription_channel }}" - install_operator_catalog: redhat-operators + install_operator_catalog: "{{ ocp4_workload_rhods_olm_catalogsource_name }}" install_operator_packagemanifest_name: "{{ ocp4_workload_rhods_olm_install_operator_name }}" - install_operator_automatic_install_plan_approval: "{{ ocp4_workload_rhods_olm_automatic_install_plan_approval | default(true) }}" - install_operator_csv_nameprefix: rhodsoperator - - install_operator_starting_csv: '' - install_operator_catalogsource_setup: "{{ ocp4_workload_rhods_olm_use_catalog_snapshot | default(false)}}" - install_operator_catalogsource_name: "{{ ocp4_workload_rhods_olm_catalogsource_name | default('') }}" - install_operator_catalogsource_namespace: "{{ ocp4_workload_rhods_olm_catalogsource_namespace | default('openshift-operators') }}" - install_operator_catalogsource_image: "{{ ocp4_workload_rhods_olm_catalog_snapshot_image | default('') }}" - install_operator_catalogsource_image_tag: "{{ ocp4_workload_rhods_olm_catalog_snapshot_image_tag | default('') }}" + install_operator_automatic_install_plan_approval: true + install_operator_csv_nameprefix: rhods-operator + install_operator_starting_csv: "" + install_operator_catalogsource_setup: true + install_operator_catalogsource_name: "{{ ocp4_workload_rhods_olm_catalogsource_name }}" + install_operator_catalogsource_namespace: "{{ ocp4_workload_rhods_olm_catalogsource_namespace }}" + install_operator_catalogsource_image: "{{ ocp4_workload_rhods_olm_catalog_snapshot_image }}" + install_operator_catalogsource_image_tag: "{{ ocp4_workload_rhods_olm_catalog_snapshot_image_tag }}" install_operator_catalogsource_pullsecrets: - addon-managed-odh-pullsecret