summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master
diff options
context:
space:
mode:
authorLutz Lange <llange@redhat.com>2016-01-12 09:09:31 +0000
committerLutz Lange <llange@redhat.com>2016-01-12 09:09:31 +0000
commit4725d3509e1315ad671a77d355c7a5328578390b (patch)
treecc19f288786204e160756440f94bc45d678cf563 /roles/openshift_master
parent25b2f5acaf140c386aff1c860b706778eba251a6 (diff)
downloadopenshift-4725d3509e1315ad671a77d355c7a5328578390b.tar.gz
openshift-4725d3509e1315ad671a77d355c7a5328578390b.tar.bz2
openshift-4725d3509e1315ad671a77d355c7a5328578390b.tar.xz
openshift-4725d3509e1315ad671a77d355c7a5328578390b.zip
- sqashed to one commit
Diffstat (limited to 'roles/openshift_master')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 647476b7f..dfcaf1953 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -87,8 +87,8 @@ kubernetesMasterConfig:
- v1beta3
- v1
{% endif %}
- apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_json }}
- controllerArguments: {{ openshift.master.controller_args | default(None) | to_json }}
+ apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_padded_yaml( level=2 ) }}
+ controllerArguments: {{ openshift.master.controller_args | default(None) | to_padded_yaml( level=2 ) }}
masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }}
masterIP: {{ openshift.common.ip }}
podEvictionTimeout: ""