summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-08-14 16:24:06 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-08-14 16:24:06 -0400
commit624a942cb5335fe0afdccd285ffddbab63c1be15 (patch)
tree04c4aae497b82066b217255f9515535733f406cb /roles/openshift_master/tasks
parent9e46630560431c8fb45db5e12472300731f75e6d (diff)
parent800256e451b112d3cd7c2356615572c0de3c3840 (diff)
downloadopenshift-624a942cb5335fe0afdccd285ffddbab63c1be15.tar.gz
openshift-624a942cb5335fe0afdccd285ffddbab63c1be15.tar.bz2
openshift-624a942cb5335fe0afdccd285ffddbab63c1be15.tar.xz
openshift-624a942cb5335fe0afdccd285ffddbab63c1be15.zip
Merge pull request #460 from detiber/serverArgs
Add support for setting kubeletArguments, controllerArguments, and apiServerArguments
Diffstat (limited to 'roles/openshift_master/tasks')
-rw-r--r--roles/openshift_master/tasks/main.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index f90f526c9..3ee21b902 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -56,6 +56,8 @@
default_subdomain: "{{ osm_default_subdomain | default(None) }}"
custom_cors_origins: "{{ osm_custom_cors_origins | default(None) }}"
default_node_selector: "{{ osm_default_node_selector | default(None) }}"
+ api_server_args: "{{ osm_api_server_args | default(None) }}"
+ controller_args: "{{ osm_controller_args | default(None) }}"
# TODO: These values need to be configurable
- name: Set dns OpenShift facts