Browse Source

Use the new election mode (client based) instead of direct etcd access

Clayton Coleman 7 years ago
parent
commit
0d633e9799
1 changed files with 2 additions and 3 deletions
  1. 2 3
      roles/openshift_master/templates/master.yaml.v1.j2

+ 2 - 3
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