Merge pull request #1110 from abutcher/args

Fix osm_controller_args and osm_api_server_args settings.

inventory/byo/hosts.aep.example

@@ -102,6 +102,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Override the default controller lease ttl
 #osm_controller_lease_ttl=30
 
+# Configure controller arguments
+#osm_controller_args={'resource-quota-sync-period': ['10s']}
+
+# Configure api server arguments
+#osm_api_server_args={'max-requests-inflight': ['400']}
+
 # default subdomain to use for exposed routes
 #osm_default_subdomain=apps.test.example.com
 

inventory/byo/hosts.origin.example

@@ -107,6 +107,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Override the default controller lease ttl
 #osm_controller_lease_ttl=30
 
+# Configure controller arguments
+#osm_controller_args={'resource-quota-sync-period': ['10s']}
+
+# Configure api server arguments
+#osm_api_server_args={'max-requests-inflight': ['400']}
+
 # default subdomain to use for exposed routes
 #osm_default_subdomain=apps.test.example.com
 

inventory/byo/hosts.ose.example

@@ -102,6 +102,12 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 # Override the default controller lease ttl
 #osm_controller_lease_ttl=30
 
+# Configure controller arguments
+#osm_controller_args={'resource-quota-sync-period': ['10s']}
+
+# Configure api server arguments
+#osm_api_server_args={'max-requests-inflight': ['400']}
+
 # default subdomain to use for exposed routes
 #osm_default_subdomain=apps.test.example.com
 

roles/openshift_master/templates/master.yaml.v1.j2

@@ -87,8 +87,8 @@ kubernetesMasterConfig:
   - v1beta3
   - v1
 {% endif %}
-  apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }}
-  controllerArguments: {{ controller_args if controller_args is defined else 'null' }}
+  apiServerArguments: {{ openshift.master.api_server_args | default(None) | to_json }}
+  controllerArguments: {{ openshift.master.controller_args | default(None) | to_json }}
   masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }}
   masterIP: {{ openshift.common.ip }}
   podEvictionTimeout: ""