Skip to content

Commit c3af486

Browse files
committed
High: mcp: Set the HA_quorum_type env variable consistently with our corosync plugin
1 parent 8c58d9e commit c3af486

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

lib/ais/plugin.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@ process_ais_conf(void)
384384
get_config_opt(pcmk_api, local_handle, "provider", &value, NULL);
385385
if (value && ais_str_eq("quorum_cman", value)) {
386386
pcmk_env.quorum = "cman";
387+
} else {
388+
pcmk_env.quorum = "pcmk";
387389
}
388390

389391
top_handle = config_find_init(pcmk_api, "service");

mcp/corosync.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,14 +457,17 @@ read_config(void)
457457
/* =::=::= Should we be here =::=::= */
458458
if (stack == pcmk_cluster_corosync) {
459459
setenv("HA_cluster_type", "corosync", 1);
460+
setenv("HA_quorum_type", "corosync", 1);
460461

461462
} else if (stack == pcmk_cluster_cman) {
462463
setenv("HA_cluster_type", "cman", 1);
464+
setenv("HA_quorum_type", "cman", 1);
463465
enable_crmd_as_root(TRUE);
464466
use_cman = TRUE;
465467

466468
} else if (stack == pcmk_cluster_classic_ais) {
467469
setenv("HA_cluster_type", "openais", 1);
470+
setenv("HA_quorum_type", "pcmk", 1);
468471

469472
/* Look for a service block to indicate our plugin is loaded */
470473
top_handle = config_find_init(config);

0 commit comments

Comments
 (0)