diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-11-16 14:00:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 14:00:51 -0500 |
| commit | c848f7d0a6c9e5281075a034e26a99739da678f6 (patch) | |
| tree | 109284804ac921b76b8fbcf5e38eb7316b57756e | |
| parent | 98e922e7f24bc1bcee2d8b43f2bbbf5b8c2f5127 (diff) | |
| parent | e5cb11494c2fdc2a6e2c4c60349e0d4c6f6561e6 (diff) | |
| download | openshift-c848f7d0a6c9e5281075a034e26a99739da678f6.tar.gz openshift-c848f7d0a6c9e5281075a034e26a99739da678f6.tar.bz2 openshift-c848f7d0a6c9e5281075a034e26a99739da678f6.tar.xz openshift-c848f7d0a6c9e5281075a034e26a99739da678f6.zip | |
Merge pull request #2636 from enlinxu/master
Support 3rd party scheduler
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 1 | ||||
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 169d7f2e3..a52ae578c 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/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 }} diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index e0c0fc644..62ac1aef5 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/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) }}" diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 474df497e..6022694bc 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/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: |