diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-08-26 17:07:06 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-04 19:57:22 -0500 |
| commit | a6dd87452379403704fb5cd1d8647ef3cf978e28 (patch) | |
| tree | 596ef9a4e3352749752ca6af62a5295defe879cd /roles/openshift_master/templates | |
| parent | 16e085b44ba3e3328ec7d8a5dd5e2331c7f633a6 (diff) | |
| download | openshift-a6dd87452379403704fb5cd1d8647ef3cf978e28.tar.gz openshift-a6dd87452379403704fb5cd1d8647ef3cf978e28.tar.bz2 openshift-a6dd87452379403704fb5cd1d8647ef3cf978e28.tar.xz openshift-a6dd87452379403704fb5cd1d8647ef3cf978e28.zip | |
fix dueling controllers - without controllerLeaseTTL set in config, multiple controllers will attempt to start
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 3f2c51417..9145df479 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -16,7 +16,9 @@ assetConfig: keyFile: master.server.key maxRequestsInFlight: 0 requestTimeoutSeconds: 0 -controllerLeaseTTL: 0 +{% if openshift_master_ha | bool %} +controllerLeaseTTL: {{ openshift.master.controller_lease_ttl | default('30') }} +{% endif %} controllers: '*' corsAllowedOrigins: {% for origin in ['127.0.0.1', 'localhost', openshift.common.ip, openshift.common.public_ip] | union(openshift.common.all_hostnames) | unique %} |