diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-08-26 10:57:28 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-08-26 10:57:28 -0400 |
| commit | d83b51bf799d00f7b2deef63f843b99a2101d1ac (patch) | |
| tree | bb9804c50b281870dc73b2b3e36616164b9375c3 /roles | |
| parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
| parent | 0077c327fd5214a9b43f8d2fde18a6325002922d (diff) | |
| download | openshift-d83b51bf799d00f7b2deef63f843b99a2101d1ac.tar.gz openshift-d83b51bf799d00f7b2deef63f843b99a2101d1ac.tar.bz2 openshift-d83b51bf799d00f7b2deef63f843b99a2101d1ac.tar.xz openshift-d83b51bf799d00f7b2deef63f843b99a2101d1ac.zip | |
Merge pull request #503 from detiber/fixKubeArgs
fix apiServerArguments and controllerServerArguments
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 44567aa22..fff123d0d 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -2,9 +2,6 @@ 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 }} @@ -16,9 +13,6 @@ 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 }} @@ -74,8 +68,8 @@ kubernetesMasterConfig: apiLevels: - v1beta3 - v1 - apiServerArguments: null - controllerArguments: null + apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }} + controllerArguments: {{ controller_args if controller_args is defined else 'null' }} {# TODO: support overriding masterCount #} masterCount: 1 masterIP: "" |