Blame SOURCES/fix-crashes-in-pcs-cluster-auth.patch
|
|
17e0eb |
From 949efde392e33171e411e86799e530f330b5a791 Mon Sep 17 00:00:00 2001
|
|
|
17e0eb |
From: Tomas Jelinek <tojeline@redhat.com>
|
|
|
17e0eb |
Date: Fri, 21 Jun 2019 12:38:07 +0200
|
|
|
17e0eb |
Subject: [PATCH] fix crashes in 'pcs cluster auth'
|
|
|
17e0eb |
|
|
|
17e0eb |
---
|
|
|
17e0eb |
pcsd/cfgsync.rb | 3 ++-
|
|
|
17e0eb |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
17e0eb |
|
|
|
17e0eb |
diff --git a/pcsd/cfgsync.rb b/pcsd/cfgsync.rb
|
|
|
17e0eb |
index 44e6d853..58857ed5 100644
|
|
|
17e0eb |
--- a/pcsd/cfgsync.rb
|
|
|
17e0eb |
+++ b/pcsd/cfgsync.rb
|
|
|
17e0eb |
@@ -852,7 +852,8 @@ module Cfgsync
|
|
|
17e0eb |
fetcher = ConfigFetcher.new(
|
|
|
17e0eb |
PCSAuth.getSuperuserAuth(), [config_new.class], nodes, cluster_name
|
|
|
17e0eb |
)
|
|
|
17e0eb |
- fetched_tokens, _ = fetcher.fetch_all()[config_new.class.name]
|
|
|
17e0eb |
+ fetched_configs, _node_connected = fetcher.fetch_all()
|
|
|
17e0eb |
+ fetched_tokens = fetched_configs[config_new.class.name]
|
|
|
17e0eb |
config_new = Cfgsync::merge_tokens_files(
|
|
|
17e0eb |
config, fetched_tokens, new_tokens, new_ports
|
|
|
17e0eb |
)
|
|
|
17e0eb |
--
|
|
|
17e0eb |
2.21.0
|
|
|
17e0eb |
|