소스 검색

support 3rd party scheduler

enlinxu 8 년 전
부모
커밋
e5cb11494c
3개의 변경된 파일7개의 추가작업 그리고 0개의 파일을 삭제
  1. 1 0
      roles/openshift_master/templates/master.yaml.v1.j2
  2. 1 0
      roles/openshift_master_facts/tasks/main.yml
  3. 5 0
      roles/openshift_node/tasks/main.yml

+ 1 - 0
roles/openshift_master/templates/master.yaml.v1.j2

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

+ 1 - 0
roles/openshift_master_facts/tasks/main.yml

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

+ 5 - 0
roles/openshift_node/tasks/main.yml

@@ -73,6 +73,11 @@
 - set_fact:
 - set_fact:
     ovs_service_status_changed: "{{ ovs_start_result | changed }}"
     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
 # TODO: add the validate parameter when there is a validation command to run
 - name: Create the Node config
 - name: Create the Node config
   template:
   template: