Quellcode durchsuchen

Merge pull request #1010 from abutcher/pacemaker-count

Use masterCount=1 with pacemaker ha
Brenton Leanhardt vor 9 Jahren
Ursprung
Commit
15aa17c616
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. 1 1
      roles/openshift_master/templates/master.yaml.v1.j2

+ 1 - 1
roles/openshift_master/templates/master.yaml.v1.j2

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