summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-01-04 13:43:12 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-04 14:55:04 -0500
commit84df9c01fdcb08875aec32d01efde2a0f7983c64 (patch)
tree34fab7ac872ff8f66f079b24b4d0031a2c445f1e
parent265cd64555c9262f0896505caa6b036f6092dd0d (diff)
downloadopenshift-84df9c01fdcb08875aec32d01efde2a0f7983c64.tar.gz
openshift-84df9c01fdcb08875aec32d01efde2a0f7983c64.tar.bz2
openshift-84df9c01fdcb08875aec32d01efde2a0f7983c64.tar.xz
openshift-84df9c01fdcb08875aec32d01efde2a0f7983c64.zip
Fix osm_controller_args and osm_api_server_args settings.
-rw-r--r--inventory/byo/hosts.aep.example6
-rw-r--r--inventory/byo/hosts.origin.example6
-rw-r--r--inventory/byo/hosts.ose.example6
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j24
4 files changed, 20 insertions, 2 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index e7e7aedfd..019984b83 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -99,6 +99,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
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index ae9c94f04..b940523cf 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -104,6 +104,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
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 54864d195..152a451bf 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -99,6 +99,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
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 5f73461d4..317049c44 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: {{ 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: ""