From 4725d3509e1315ad671a77d355c7a5328578390b Mon Sep 17 00:00:00 2001
From: Lutz Lange <llange@redhat.com>
Date: Tue, 12 Jan 2016 09:09:31 +0000
Subject: - sqashed to one commit
---
roles/openshift_master/templates/master.yaml.v1.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'roles/openshift_master')
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: ""
--
cgit v1.2.3