diff --git a/conf/README.md b/conf/README.md index eac213b5653..97afeb9efc1 100644 --- a/conf/README.md +++ b/conf/README.md @@ -258,7 +258,7 @@ higher priority). * `storageclassnames` - Under this key, custom storage class names for `cephFilesystems`, `cephObjectStores`, `cephBlockPools`, `cephNonResilientPools`, `nfs` and for `encryption` are defined. * `submariner_source` - Source from which we take submariner build, ex: upstream, downstream, downstream_unreleased * `submariner_release_type` - Released OR Unreleased submariner build -* `enable_globalnet` - enable or disable globalnet for submariner +* `enable_globalnet` - enable or disable globalnet for submariner, default: true * `submariner_unreleased_channel` - submariner channel for unreleased downstream build #### UPGRADE diff --git a/conf/ocsci/disable_globalnet.yaml b/conf/ocsci/disable_globalnet.yaml new file mode 100644 index 00000000000..e5041e99c12 --- /dev/null +++ b/conf/ocsci/disable_globalnet.yaml @@ -0,0 +1,2 @@ +ENV_DATA: + enable_globalnet: false diff --git a/conf/ocsci/enable_globalnet.yaml b/conf/ocsci/enable_globalnet.yaml deleted file mode 100644 index 722d3b4a375..00000000000 --- a/conf/ocsci/enable_globalnet.yaml +++ /dev/null @@ -1,2 +0,0 @@ -ENV_DATA: - enable_globalnet: true diff --git a/ocs_ci/deployment/acm.py b/ocs_ci/deployment/acm.py index 04b46c78d8f..ca6936b7787 100644 --- a/ocs_ci/deployment/acm.py +++ b/ocs_ci/deployment/acm.py @@ -115,7 +115,7 @@ def create_acm_brew_icsp(self): This is a prereq for downstream unreleased submariner """ - icsp_data = templating.load_yaml(constants.ACM_DOWNSTREAM_BREW_ICSP) + icsp_data = templating.load_yaml(constants.SUBMARINER_DOWNSTREAM_BREW_ICSP) icsp_data_yaml = tempfile.NamedTemporaryFile( mode="w+", prefix="acm_icsp", delete=False ) diff --git a/ocs_ci/ocs/constants.py b/ocs_ci/ocs/constants.py index f4c6313e7dd..19c66ff9cb1 100644 --- a/ocs_ci/ocs/constants.py +++ b/ocs_ci/ocs/constants.py @@ -2113,8 +2113,8 @@ ACM_HUB_UNRELEASED_ICSP_YAML = os.path.join( TEMPLATE_DIR, "acm-deployment", "imagecontentsourcepolicy.yaml" ) -ACM_DOWNSTREAM_BREW_ICSP = os.path.join( - TEMPLATE_DIR, "acm-deployment", "acm_downstream_brew_icsp.yaml" +SUBMARINER_DOWNSTREAM_BREW_ICSP = os.path.join( + TEMPLATE_DIR, "acm-deployment", "submariner_downstream_brew_icsp.yaml" ) ACM_HUB_UNRELEASED_PULL_SECRET_TEMPLATE = "pull-secret.yaml.j2" ACM_ODF_MULTICLUSTER_ORCHESTRATOR_RESOURCE = "odf-multicluster-orchestrator" diff --git a/ocs_ci/templates/acm-deployment/acm_downstream_brew_icsp.yaml b/ocs_ci/templates/acm-deployment/submariner_downstream_brew_icsp.yaml similarity index 100% rename from ocs_ci/templates/acm-deployment/acm_downstream_brew_icsp.yaml rename to ocs_ci/templates/acm-deployment/submariner_downstream_brew_icsp.yaml