From 6913cef1fa9d7134689c9bdcfe177fb226d9b0d4 Mon Sep 17 00:00:00 2001 From: Ivan Devat Date: Mon, 26 Feb 2018 16:24:20 +0100 Subject: [PATCH] open corosync + pacemaker authkey in binary mode --- pcs/cluster.py | 2 +- pcs/lib/commands/test/remote_node/fixtures_add.py | 1 + pcs/lib/pacemaker/env.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pcs/cluster.py b/pcs/cluster.py index 50f05f7..d7158b1 100644 --- a/pcs/cluster.py +++ b/pcs/cluster.py @@ -1834,7 +1834,7 @@ def node_add(lib_env, node0, node1, modifiers): com_cmd = DistributeFiles( lib_env.report_processor, node_communication_format.corosync_authkey_file( - open(settings.corosync_authkey_file).read() + open(settings.corosync_authkey_file, "rb").read() ), # added force, it was missing before # but it doesn't make sence here diff --git a/pcs/lib/commands/test/remote_node/fixtures_add.py b/pcs/lib/commands/test/remote_node/fixtures_add.py index 2b674b8..a4c2092 100644 --- a/pcs/lib/commands/test/remote_node/fixtures_add.py +++ b/pcs/lib/commands/test/remote_node/fixtures_add.py @@ -82,6 +82,7 @@ class EnvConfigMixin(object): self.config.fs.open( self.PCMK_AUTHKEY_PATH, + mode="rb", **kwargs ) diff --git a/pcs/lib/pacemaker/env.py b/pcs/lib/pacemaker/env.py index 43f3b07..933bac1 100644 --- a/pcs/lib/pacemaker/env.py +++ b/pcs/lib/pacemaker/env.py @@ -17,6 +17,7 @@ class PacemakerEnv(object): self.__authkey = RealFile( file_role=env_file_role_codes.PACEMAKER_AUTHKEY, file_path=settings.pacemaker_authkey_file, + is_binary=True, ) @property -- 1.8.3.1