High: mcp: Set the HA_quorum_type env variable consistently with our …

…corosync plugin
ClusterLabs · Oct 12, 2011 · c3af486 · c3af486
1 parent 8c58d9e
commit c3af486
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/lib/ais/plugin.c b/lib/ais/plugin.c
@@ -384,6 +384,8 @@ process_ais_conf(void)
     get_config_opt(pcmk_api, local_handle, "provider", &value, NULL);
     if (value && ais_str_eq("quorum_cman", value)) {
         pcmk_env.quorum = "cman";
+    } else {
+        pcmk_env.quorum = "pcmk";
     }
 
     top_handle = config_find_init(pcmk_api, "service");

diff --git a/mcp/corosync.c b/mcp/corosync.c
@@ -457,14 +457,17 @@ read_config(void)
     /* =::=::= Should we be here =::=::= */
     if (stack == pcmk_cluster_corosync) {
         setenv("HA_cluster_type", "corosync", 1);
+        setenv("HA_quorum_type",  "corosync", 1);
 
     } else if (stack == pcmk_cluster_cman) {
         setenv("HA_cluster_type", "cman", 1);
+        setenv("HA_quorum_type",  "cman", 1);
         enable_crmd_as_root(TRUE);
         use_cman = TRUE;
 
     } else if (stack == pcmk_cluster_classic_ais) {
         setenv("HA_cluster_type", "openais", 1);
+        setenv("HA_quorum_type",  "pcmk", 1);
 
         /* Look for a service block to indicate our plugin is loaded */
         top_handle = config_find_init(config);