diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-07-22 14:09:42 -0400 |
|---|---|---|
| committer | Clayton Coleman <ccoleman@redhat.com> | 2017-08-08 12:50:22 -0400 |
| commit | 0d633e97991aecd9559334ba8fe6a59267efa871 (patch) | |
| tree | d5c16d587ea6e03b629c72cc2ce783b184d6a82b /roles/openshift_master | |
| parent | 1f527e2f2dbf1508ab249589680a3f9f5a8d4966 (diff) | |
| download | openshift-0d633e97991aecd9559334ba8fe6a59267efa871.tar.gz openshift-0d633e97991aecd9559334ba8fe6a59267efa871.tar.bz2 openshift-0d633e97991aecd9559334ba8fe6a59267efa871.tar.xz openshift-0d633e97991aecd9559334ba8fe6a59267efa871.zip | |
Use the new election mode (client based) instead of direct etcd access
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2 index 7964bbb48..c14579435 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -47,11 +47,10 @@ assetConfig: {% if openshift.master.audit_config | default(none) is not none and openshift.common.version_gte_3_2_or_1_2 | bool %} auditConfig:{{ openshift.master.audit_config | to_padded_yaml(level=1) }} {% endif %} -{% if openshift_master_ha | bool %} -controllerLeaseTTL: {{ openshift.master.controller_lease_ttl | default('30') }} -{% endif %} {% if openshift.common.version_gte_3_3_or_1_3 | bool %} controllerConfig: + election: + lockName: openshift-master-controllers serviceServingCert: signer: certFile: service-signer.crt |