Merge pull request #2636 from enlinxu/master

Support 3rd party scheduler

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

@@ -131,6 +131,7 @@ kubernetesMasterConfig:
   proxyClientInfo:
     certFile: master.proxy-client.crt
     keyFile: master.proxy-client.key
+  schedulerArguments: {{ openshift_master_scheduler_args | default(None) | to_padded_yaml( level=3 ) }}
   schedulerConfigFile: {{ openshift_master_scheduler_conf }}
   servicesNodePortRange: ""
   servicesSubnet: {{ openshift.common.portal_net }}

roles/openshift_master_facts/tasks/main.yml

@@ -80,3 +80,4 @@
       controllers_env_vars: "{{ openshift_master_controllers_env_vars | default(None) }}"
       audit_config: "{{ openshift_master_audit_config | default(None) }}"
       metrics_public_url: "{% if openshift_hosted_metrics_deploy | default(false) %}https://{{ metrics_hostname }}/hawkular/metrics{% endif %}"
+      scheduler_args: "{{ openshift_master_scheduler_args | default(None) }}"

roles/openshift_node/tasks/main.yml

@@ -77,6 +77,11 @@
 - set_fact:
     ovs_service_status_changed: "{{ ovs_start_result | changed }}"
 
+- file:
+    dest: "{{ (openshift_node_kubelet_args|default({'config':None})).config}}"
+    state: directory
+  when: openshift_node_kubelet_args is defined and 'config' in openshift_node_kubelet_args
+
 # TODO: add the validate parameter when there is a validation command to run
 - name: Create the Node config
   template: