assisted: defaults to converged flow

Author: karmab

kcli.spec

@@ -1,4 +1,3 @@
-#
 # spec file for kcli package
 #
 # Copyright (c) 2017 Karim Boumedhel

kvirt/cluster/openshift/apps/advanced-cluster-management/assisted-service.sample.yml

@@ -14,9 +14,6 @@ metadata:
   labels:
     app: assisted-service
 data:
-{% if not assisted_converged_flow %}
-  ALLOW_CONVERGED_FLOW: "false"
-{% endif %}
   LOG_LEVEL: "debug"
 {% if assisted_disable_validations %}
   DISABLED_HOST_VALIDATIONS: belongs-to-majority-group,belongs-to-machine-cidr,ntp-synced,release-domain-name-resolved-correctly,dns-wildcard-not-configured

kvirt/cluster/openshift/apps/advanced-cluster-management/kcli_default.yml

@@ -6,7 +6,6 @@ acm_hypershift: true
 acm_mce_catalog:
 acm_siteconfig: true
 assisted: false
-assisted_converged_flow: false
 assisted_disable_validations: false
 assisted_download_images: false
 assisted_download_nic: eth0

kvirt/cluster/openshift/apps/multicluster-engine/assisted-service.sample.yml

@@ -14,9 +14,7 @@ metadata:
   labels:
     app: assisted-service
 data:
-{% if not assisted_converged_flow %}
-  ALLOW_CONVERGED_FLOW: "false"
-{% endif %}
+  ALLOW_CONVERGED_FLOW: "true"
   LOG_LEVEL: "debug"
 {% if assisted_disable_validations %}
   DISABLED_HOST_VALIDATIONS: belongs-to-majority-group,belongs-to-machine-cidr,ntp-synced,release-domain-name-resolved-correctly,dns-wildcard-not-configured

kvirt/cluster/openshift/apps/multicluster-engine/kcli_default.yml

@@ -2,7 +2,6 @@ mce_hypershift: true
 mce_ha_config: true
 assisted: false
 assisted_disable_validations: false
-assisted_converged_flow: false
 assisted_download_nic: eth0
 assisted_pvc_size: 20
 disconnected_url: