Enable missing feature-gate for VolumeScheduling (also use already defined feature-gate entry for node config)

roles/openshift_control_plane/templates/master.yaml.v1.j2

@@ -85,11 +85,13 @@ kubernetesMasterConfig:
 {% if openshift_master_use_persistentlocalvolumes | bool %}
     feature-gates:
     - PersistentLocalVolumes=true
+    - VolumeScheduling=true
 {% endif %}
   controllerArguments: {{ openshift.master.controller_args | default(None) | lib_utils_to_padded_yaml( level=2 ) }}
 {% if openshift_master_use_persistentlocalvolumes | bool %}
     feature-gates:
     - PersistentLocalVolumes=true
+    - VolumeScheduling=true
 {% endif %}
   masterCount: {{ openshift_master_count | default(groups.oo_masters | length) }}
   masterIP: {{ openshift.common.ip }}

roles/openshift_node_group/templates/node-config.yaml.j2

@@ -36,6 +36,10 @@ kubeletArguments:
   - /etc/origin/node/bootstrap.kubeconfig
   feature-gates:
   - RotateKubeletClientCertificate=true,RotateKubeletServerCertificate=true
+{% if openshift_node_group_use_persistentlocalvolumes | bool %}
+  - PersistentLocalVolumes=true
+  - VolumeScheduling=true
+{% endif %}
   rotate-certificates:
   - "true"
   cert-dir:
@@ -50,10 +54,6 @@ kubeletArguments:
   - "{{ openshift_node_group_labels | join(',') }}"
   enable-controller-attach-detach:
   - 'true'
-{% if openshift_node_group_use_persistentlocalvolumes | bool %}
-  feature-gates:
-  - PersistentLocalVolumes=true
-{% endif %}
 masterClientConnectionOverrides:
   acceptContentTypes: application/vnd.kubernetes.protobuf,application/json
   burst: 40