diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-08-14 16:24:06 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-08-14 16:24:06 -0400 |
| commit | 624a942cb5335fe0afdccd285ffddbab63c1be15 (patch) | |
| tree | 04c4aae497b82066b217255f9515535733f406cb /roles/openshift_master/templates | |
| parent | 9e46630560431c8fb45db5e12472300731f75e6d (diff) | |
| parent | 800256e451b112d3cd7c2356615572c0de3c3840 (diff) | |
| download | openshift-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/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index b5e3d2f05..44567aa22 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -2,6 +2,9 @@ apiLevels: - v1beta3 - v1 apiVersion: v1 +{% if api_server_args is defined and api_server_args %} +apiServerArguments: {{ api_server_args }} +{% endif %} assetConfig: logoutURL: "" masterPublicURL: {{ openshift.master.public_api_url }} @@ -13,6 +16,9 @@ assetConfig: keyFile: master.server.key maxRequestsInFlight: 0 requestTimeoutSeconds: 0 +{% if controller_args is defined and controller_args %} +controllerArguments: {{ controller_args }} +{% endif %} corsAllowedOrigins: {% for origin in ['127.0.0.1', 'localhost', openshift.common.hostname, openshift.common.ip, openshift.common.public_hostname, openshift.common.public_ip] %} - {{ origin }} |