File tree Expand file tree Collapse file tree 10 files changed +12
-33
lines changed Expand file tree Collapse file tree 10 files changed +12
-33
lines changed Original file line number Diff line number Diff line change @@ -26,5 +26,4 @@ effect if `cifmw_openshift_setup_ca_registry_to_add` is set.
2626 mirrors:
2727 - mirror.quay.rdoproject.org
2828 ```
29- * ` cifmw_openshift_setup_metal3_watch_all_ns ` : (Boolean) Tells Metal3 BMO to watch resources out of its namespace. Defaults to ` false ` .
3029* ` cifmw_openshift_setup_apply_marketplace_fix ` : (Boolean) Apply openshift-marketplace workaround which is recreating all pods in the namespace. NOTE: same step is done in ` base ` job.
Original file line number Diff line number Diff line change @@ -24,7 +24,6 @@ cifmw_openshift_setup_skip_internal_registry: false
2424cifmw_openshift_setup_skip_internal_registry_tls_verify : false
2525cifmw_openshift_setup_ca_bundle_path : " /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"
2626cifmw_openshift_setup_digest_mirrors : []
27- cifmw_openshift_setup_metal3_watch_all_ns : false
2827cifmw_openshift_setup_operator_override_catalog_name : " redhat-operators-4.17"
2928cifmw_openshift_setup_operator_override_catalog_namespace : " openshift-marketplace"
3029cifmw_openshift_setup_operator_override_catalog_image : " registry.redhat.io/redhat/redhat-operator-index:v4.17"
Original file line number Diff line number Diff line change 213213 spec :
214214 repositoryDigestMirrors : " {{ cifmw_openshift_setup_digest_mirrors }}"
215215
216- - name : Metal3 tweaks
217- when : not cifmw_openshift_setup_dry_run
218- ansible.builtin.include_tasks : metal3_config.yml
219-
220216- name : Patch network operator when using OVNKubernetes backend
221217 ansible.builtin.import_tasks : patch_network_operator.yml
222218
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -104,7 +104,8 @@ cifmw_config_bmh: true
104104# BMH are deployed in a differnt NS than the secret OSP BMO
105105# references in each BMH. Metal3 requires the referenced
106106# secrets to be in the same NS or be allowed to access them
107- cifmw_openshift_setup_metal3_watch_all_ns : true
107+ cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces :
108+ bmo_watch_all_namespaces : true
108109
109110# Use EDPM image for computes
110111cifmw_update_containers_edpm_image_url : " {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
Original file line number Diff line number Diff line change @@ -104,7 +104,8 @@ cifmw_config_bmh: true
104104# BMH are deployed in a differnt NS than the secret OSP BMO
105105# references in each BMH. Metal3 requires the referenced
106106# secrets to be in the same NS or be allowed to access them
107- cifmw_openshift_setup_metal3_watch_all_ns : true
107+ cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces :
108+ bmo_watch_all_namespaces : true
108109
109110# Use EDPM image for computes
110111cifmw_update_containers_edpm_image_url : " {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
Original file line number Diff line number Diff line change @@ -104,7 +104,8 @@ cifmw_config_bmh: true
104104# BMH are deployed in a differnt NS than the secret OSP BMO
105105# references in each BMH. Metal3 requires the referenced
106106# secrets to be in the same NS or be allowed to access them
107- cifmw_openshift_setup_metal3_watch_all_ns : true
107+ cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces :
108+ bmo_watch_all_namespaces : true
108109
109110# Use EDPM image for computes
110111cifmw_update_containers_edpm_image_url : " {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
Original file line number Diff line number Diff line change @@ -104,7 +104,8 @@ cifmw_config_bmh: true
104104# BMH are deployed in a differnt NS than the secret OSP BMO
105105# references in each BMH. Metal3 requires the referenced
106106# secrets to be in the same NS or be allowed to access them
107- cifmw_openshift_setup_metal3_watch_all_ns : true
107+ cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces :
108+ bmo_watch_all_namespaces : true
108109
109110# Use EDPM image for computes
110111cifmw_update_containers_edpm_image_url : " {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
Original file line number Diff line number Diff line change @@ -104,7 +104,8 @@ cifmw_config_bmh: true
104104# BMH are deployed in a differnt NS than the secret OSP BMO
105105# references in each BMH. Metal3 requires the referenced
106106# secrets to be in the same NS or be allowed to access them
107- cifmw_openshift_setup_metal3_watch_all_ns : true
107+ cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces :
108+ bmo_watch_all_namespaces : true
108109
109110# Use EDPM image for computes
110111cifmw_update_containers_edpm_image_url : " {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
Original file line number Diff line number Diff line change @@ -102,7 +102,8 @@ cifmw_config_bmh: true
102102# BMH are deployed in a differnt NS than the secret OSP BMO
103103# references in each BMH. Metal3 requires the referenced
104104# secrets to be in the same NS or be allowed to access them
105- cifmw_openshift_setup_metal3_watch_all_ns : true
105+ cifmw_devscripts_config_overrides_patch_bmo_watch_all_namespaces :
106+ bmo_watch_all_namespaces : true
106107
107108# Use EDPM image for computes
108109cifmw_update_containers_edpm_image_url : " {{ cifmw_update_containers_registry }}/{{ cifmw_update_containers_org }}/edpm-hardened-uefi:{{ cifmw_update_containers_tag }}"
You can’t perform that action at this time.
0 commit comments