Add a flag to disable hived scheduler during installation

contrib/kubespray/config/config.yaml

@@ -5,6 +5,11 @@ docker_image_tag: v1.5.0
 
 # Optional
 
+#######################################################################
+#                    OpenPAI Customized Settings                      #
+#######################################################################
+# enable_hived_scheduler: true
+
 #############################################
 # Ansible-playbooks' inventory hosts' vars. #
 #############################################

contrib/kubespray/quick-start/services-configuration.yaml.template

@@ -48,11 +48,12 @@ webportal:
 
 # If you want to customize the scheduling config, such add more virtual clusters or more gpu types, check:
 # https://github.com/microsoft/pai/blob/master/docs/manual/cluster-admin/how-to-set-up-virtual-clusters.md
+{% if env["cfg"]["enable_hived_scheduler"]|default(true) is sameas true %}
 hivedscheduler:
   config: |
     physicalCluster:
       skuTypes:
-        {% for sku_name, sku_spec in env["hived"]["skus"].items() -%}
+        {%- for sku_name, sku_spec in env["hived"]["skus"].items() %}
         {{ sku_name }}:
         {%- if sku_spec.gpu %}
           gpu: 1
@@ -61,9 +62,9 @@ hivedscheduler:
           cpu: 1
         {%- endif %}
           memory: {{ sku_spec.memory }}Mi
-        {% endfor %}
+        {%- endfor %}
       cellTypes:
-        {% for sku_name, sku_spec in env["hived"]["skus"].items() -%}
+        {%- for sku_name, sku_spec in env["hived"]["skus"].items() %}
         {{ sku_name }}-NODE:
           childCellType: {{ sku_name }}
           {%- if sku_spec.gpu %}
@@ -75,27 +76,28 @@ hivedscheduler:
         {{ sku_name }}-NODE-POOL:
           childCellType: {{ sku_name }}-NODE
           childCellNumber: {{ sku_spec.workers|length }}
-        {% endfor %}
+        {%- endfor %}
       physicalCells:
-      {% for sku_name, sku_spec  in env["hived"]["skus"].items() -%}
+      {%- for sku_name, sku_spec  in env["hived"]["skus"].items() %}
       - cellType: {{ sku_name }}-NODE-POOL
         cellChildren:
-        {% for worker in sku_spec.workers -%}
+        {%- for worker in sku_spec.workers %}
         - cellAddress: {{ worker }}
-        {% endfor %}
-      {% endfor -%}
-
+        {%- endfor %}
+      {%- endfor %}
     virtualClusters:
-      {% for sku_name, sku_spec  in env["hived"]["skus"].items() -%}
-        {% if loop.index0 == 0 %}
+      {%- for sku_name, sku_spec  in env["hived"]["skus"].items() %}
+        {%- if loop.index0 == 0 %}
         default:
-        {% else %}
+        {%- else %}
         {{ sku_name }}:
-        {% endif %}
+        {%- endif %}
           virtualCells:
           - cellType: {{ sku_name }}-NODE-POOL.{{ sku_name }}-NODE
             cellNumber: {{ sku_spec.workers|length }}
-      {% endfor %}
+      {%- endfor %}
+{% else %}
+{% endif %}
 
 # uncomment following section, if you want to customize the authentication solution.
 authentication:

contrib/kubespray/script/openpai_generator.py

@@ -249,7 +249,14 @@ def main():
 
     masters, workers = get_masters_workers_from_layout(layout)
     head_node = masters[0]
-    hived_config = get_hived_config(layout, cluster_config)
+
+    # Hivedscheduler is enabled by default.
+    # But if the user sets enable_hived_scheduler to false manually,
+    # we should disable it.
+    if 'enable_hived_scheduler' in cluster_config and cluster_config['enable_hived_scheduler'] is False:
+        hived_config = {}
+    else:
+        hived_config = get_hived_config(layout, cluster_config)
 
     environment = {
         'masters': masters,