Skip to content

Commit 91fc05f

Browse files
committed
Patch pvecm client to work with link0 addr, fix #91
1 parent 43a6a38 commit 91fc05f

File tree

2 files changed

+33
-0
lines changed

2 files changed

+33
-0
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
to unbreak joining via SSH with an explicit link address.
2+
3+
Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
4+
---
5+
data/PVE/CLI/pvecm.pm | 4 +++-
6+
1 file changed, 3 insertions(+), 1 deletion(-)
7+
8+
diff --git a/data/PVE/CLI/pvecm.pm b/data/PVE/CLI/pvecm.pm
9+
index b381f4f..fe099d4 100755
10+
--- /usr/share/perl5/PVE/CLI/pvecm.pm
11+
+++ /usr/share/perl5/PVE/CLI/pvecm.pm
12+
@@ -405,9 +405,11 @@ __PACKAGE__->register_method ({
13+
push @$cmd, '--nodeid', $param->{nodeid} if $param->{nodeid};
14+
push @$cmd, '--votes', $param->{votes} if defined($param->{votes});
15+
16+
+ my $link_desc = get_standard_option('corosync-link');
17+
+
18+
foreach my $link (keys %$links) {
19+
push @$cmd, "--link$link", PVE::JSONSchema::print_property_string(
20+
- $links->{$link}, get_standard_option('corosync-link'));
21+
+ $links->{$link}, $link_desc->{format});
22+
}
23+
24+
# this will be used as fallback if no links are specified
25+
--
26+

tasks/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,13 @@
163163

164164
- import_tasks: kernel_module_cleanup.yml
165165

166+
- name: "[TEMPFIX] Fix cluster joins on PVE 6"
167+
patch:
168+
src: "01_pass_correct_format_for_linkX.patch"
169+
basedir: /
170+
strip: 1
171+
when: ansible_distribution_release == 'buster'
172+
166173
- import_tasks: pve_cluster_config.yml
167174
when: "pve_cluster_enabled | bool"
168175

0 commit comments

Comments
 (0)