[pve-devel] applied: [PATCH pmg_docs 1/1] Consistency of GB and GiB pmg
applied this one to pmg-docs - huge thanks! On Mon, Jul 10, 2023 at 03:49:49PM +0200, Noel Ullreich wrote: > Since the actual system-checks are done in GiB and to stay consistent > with the other docs, change all GB units to GiB > > Signed-off-by: Noel Ullreich > --- > pmg-planning-deployment.adoc | 8 > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/pmg-planning-deployment.adoc b/pmg-planning-deployment.adoc > index 9287574..6a0083b 100644 > --- a/pmg-planning-deployment.adoc > +++ b/pmg-planning-deployment.adoc > @@ -110,13 +110,13 @@ Minimum System Requirements > > * CPU: 64bit (Intel EMT64 or AMD64) > > -* 2 GB RAM > +* 2 GiB RAM > > * Bootable CD-ROM-drive or USB boot support > > * Monitor with a minimum resolution of 1024x768 for the installation > > -* Hard disk with at least 8 GB of disk space > +* Hard disk with at least 8 GiB of disk space > > * Ethernet network interface card (NIC) > > @@ -127,7 +127,7 @@ Recommended System Requirements > * Multi-core CPU: 64bit (Intel EMT64 or AMD64), + > ** for use in a virtual machine, activate Intel VT/AMD-V CPU flag > > -* 4 GB RAM > +* 4 GiB RAM > > * Bootable CD-ROM-drive or USB boot support > > @@ -135,7 +135,7 @@ Recommended System Requirements > > * 1 Gbps Ethernet network interface card (NIC) > > -* Storage: at least 8 GB free disk space, best set up with redundancy, > +* Storage: at least 8 GiB free disk space, best set up with redundancy, >using a hardware RAID controller with battery backed write cache (``BBU'') > or >ZFS. ZFS is not compatible with hardware RAID controllers. For best >performance, use enterprise-class SSDs with power loss protection. > -- > 2.39.2 > > > > ___ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH pve-docs; pmg-docs 0/6] Fix consistency of some words
Thanks for the patch @Noel, and thanks for the heads-up @Thomas! applied the pmg-docs parts as well (with one typo fixed up). On Fri, Nov 17, 2023 at 10:58:03AM +0100, Thomas Lamprecht wrote: > Am 03/07/2023 um 14:04 schrieb Noel Ullreich: > > In the docs for pve, pmg, and pbs, the consistency and grammatical > > correctness of some common words was not always good. > > I fixed the words: > > * USB flash drive > > * command line/command-line/commandline > > * motherboard/mainboard/main board > > * passhrough/pass-through > > > > Really, these are just some quick ones I found that (imo) were easy and > > necessary to fix, and, if possible, this should be automated somehow. > > Dietmar and I talked about this off-list and brainstormed some ideas, > > but nothing concrete so far. > > > > I also added some tables in our internal writing style guide, perhaps > > this should be made public? For those, that are interested in writing > > docs for pve/pbs/pmg? > > > > > > changes from v1: > > * the patches for proxmox-backup/docs have been applied > > * fixed spelling mistakes in the commit messages > > > > Noel Ullreich (4): > > Consistency of passthrough/pass-through > > Consistency: change mainboard to motherboard > > Consistency of USB flash drive spelling > > Fix spelling of command line/command-line > > > > certificate-management.adoc | 2 +- > > ha-manager.adoc | 10 +- > > index.adoc | 2 +- > > pct.adoc | 10 +- > > pve-admin-guide.adoc | 4 ++-- > > pve-faq.adoc | 2 +- > > pve-firewall.adoc| 2 +- > > pve-installation-media.adoc | 2 +- > > pve-intro.adoc | 6 +++--- > > pve-storage-lvmthin.adoc | 2 +- > > pve-storage-pbs.adoc | 2 +- > > pve-system-requirements.adoc | 2 +- > > pveceph.adoc | 6 +++--- > > pvecm.adoc | 4 ++-- > > pvesm.adoc | 4 ++-- > > pvesr.adoc | 6 +++--- > > pveum.adoc | 10 +- > > qm-pci-passthrough.adoc | 2 +- > > qm.adoc | 10 +- > > qm.conf.5-opts.adoc | 10 +- > > vzdump.adoc | 2 +- > > 21 files changed, 50 insertions(+), 50 deletions(-) > > > > Noel Ullreich (2): > > consistenct of USB flash drive spelling > > Fixed spelling of command line/command-line > > > > pmg-admin-guide.adoc| 4 ++-- > > pmg-administration.adoc | 2 +- > > pmg-installation-media.adoc | 2 +- > > pmg-intro.adoc | 4 ++-- > > pmg-ssl-certificate.adoc| 6 +++--- > > pmgbackup.adoc | 4 ++-- > > pmgcm.adoc | 6 +++--- > > pmgconfig.adoc | 4 ++-- > > pmgperf.adoc| 2 +- > > 9 files changed, 17 insertions(+), 17 deletions(-) > > > applied the PVE side with a few fixes to typo regressions... > > @stoiko, maybe check/apply the pmg side of this sometime (no pressure) ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] applied: [PATCH pve-network 0/4] evpn controller fix && cleanup
Am 03/12/2023 um 16:46 schrieb Alexandre Derumier: > This patch serie is fixing 1 critical bug with multiple exit-nodes > and other minor ipv6 bug with prefix-list && null routes. > > Also cleaning the re-ordering of some values in frr.conf to match > the output of frr running config. > > Alexandre Derumier (4): > controllers: evpn: add ipv6 prefix-list support > controllers: evpn: bugfix: use prefix-list in route-map instead evpn > match > controllers: evpn: frr config cleanup > controllers: evpn: fix null routes order && ipv6 > > src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 52 +++ > .../expected_controller_config| 6 +-- > .../expected_controller_config| 6 +-- > .../evpn/ebgp/expected_controller_config | 6 +-- > .../ebgp_loopback/expected_controller_config | 6 +-- > .../evpn/exitnode/expected_controller_config | 19 --- > .../expected_controller_config| 19 --- > .../expected_controller_config| 18 +-- > .../exitnode_snat/expected_controller_config | 19 --- > .../expected_controller_config| 33 +--- > .../exitnodenullroute/expected_sdn_interfaces | 8 +++ > .../zones/evpn/exitnodenullroute/sdn_config | 35 + > .../evpn/ipv4/expected_controller_config | 6 +-- > .../evpn/ipv4ipv6/expected_controller_config | 6 +-- > .../expected_controller_config| 6 +-- > .../evpn/ipv6/expected_controller_config | 6 +-- > .../evpn/isis/expected_controller_config | 6 +-- > .../isis_loopback/expected_controller_config | 6 +-- > .../expected_controller_config| 6 +-- > .../multiplezones/expected_controller_config | 6 +-- > .../evpn/rt_import/expected_controller_config | 6 +-- > .../evpn/vxlanport/expected_controller_config | 6 +-- > 22 files changed, 203 insertions(+), 84 deletions(-) > sorry for the delay, applied series now, thanks! ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH container] fix #5194: delete environment variables set by pve
proxmox-perl-rs set's SSL_CERT_{DIR,FILE}, which can break ssl in
containers if their certificate store can't be found in the same spot.
This patch explicitly unsets those variables before starting the
container.
Signed-off-by: Folke Gleumes
---
src/PVE/CLI/pct.pm | 11 +++
1 file changed, 11 insertions(+)
diff --git a/src/PVE/CLI/pct.pm b/src/PVE/CLI/pct.pm
index a0b9bce..53519e4 100755
--- a/src/PVE/CLI/pct.pm
+++ b/src/PVE/CLI/pct.pm
@@ -143,6 +143,15 @@ __PACKAGE__->register_method ({
exec(@$cmd);
}});
+sub clean_environment {
+# These env variables are currently needed by PVE to work correctly with
rust libraries,
+# but can break ssl inside of containers.
+# An explanation why they are needed and the code that sets them can be
found here:
+#
https://git.proxmox.com/?p=proxmox-perl-rs.git;a=blob;f=common/pkg/Proxmox/Lib/SslProbe.pm
+delete $ENV{SSL_CERT_FILE};
+delete $ENV{SSL_CERT_DIR};
+};
+
__PACKAGE__->register_method ({
name => 'enter',
path => 'enter',
@@ -164,6 +173,7 @@ __PACKAGE__->register_method ({
PVE::LXC::Config->load_config($vmid); # test if container exists on
this node
die "container '$vmid' not running!\n" if
!PVE::LXC::check_running($vmid);
+ clean_environment();
exec('lxc-attach', '-n', $vmid);
}});
@@ -189,6 +199,7 @@ __PACKAGE__->register_method ({
die "missing command" if !@{$param->{'extra-args'}};
+ clean_environment();
exec('lxc-attach', '-n', $vmid, '--', @{$param->{'extra-args'}});
}});
--
2.39.2
___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH manager] vzdump: also warn when hook script fails for backup-abort or log-end phase
to make it more visible, also in task logs.
Signed-off-by: Fiona Ebner
---
PVE/VZDump.pm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index 4185ed62..98641f5a 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -1269,6 +1269,7 @@ sub exec_backup_task {
debugmsg ('info', "Failed at " . strftime("%F %H:%M:%S", localtime()));
eval { $self->run_hook_script ('backup-abort', $task, $logfd); };
+ debugmsg('warn', $@) if $@; # message already contains command with
phase name
} else {
$task->{state} = 'ok';
@@ -1300,6 +1301,7 @@ sub exec_backup_task {
}
eval { $self->run_hook_script ('log-end', $task); };
+debugmsg('warn', $@) if $@; # message already contains command with phase
name
die $err if $err && $err =~ m/^interrupted by signal$/;
}
--
2.39.2
___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
Re: [pve-devel] [PATCH pve-network 0/1] Fixed Netbox API Path
Hi, Indeed you are right, I really didn't have noticed this wrong api call. (I have done phpipam && netbox at the same time, so I think just use wrong call here) ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-network 0/1] Fixed Netbox API Path
--- Begin Message --- Seems that Netbox IPAM Plugin is originally copied from PHPIPAM and use the wrong API Path. It will cause the error when adding existed subnet with following error msg "create sdn subnet object failed: Invalid response from server: 404 Not Found (500)" Jasper Yu (1): fix: Netbox API Path src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.1 --- End Message --- ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-network 1/1] fix: Netbox API Path
--- Begin Message ---
Signed-off-by: Jasper Yu <007sea...@gmail.com>
---
src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
index 91010bb..666ea70 100644
--- a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
@@ -288,7 +288,7 @@ sub get_ip_id {
sub is_ip_gateway {
my ($url, $ip, $headers) = @_;
-my $result = PVE::Network::SDN::api_request("GET",
"$url/addresses/search/$ip", $headers);
+my $result = PVE::Network::SDN::api_request("GET",
"$url/ipam/ip-addresses/?q=$ip", $headers);
my $data = @{$result->{data}}[0];
my $description = $data->{description};
my $is_gateway = 1 if $description eq 'gateway';
--
2.39.1
--- End Message ---
___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-network 0/1] Fixed Netbox API Path
--- Begin Message --- Seems that Netbox IPAM Plugin is originally copied from PHPIPAM and use the wrong API Path. It will cause the error when adding existed subnet with following error msg "create sdn subnet object failed: Invalid response from server: 404 Not Found (500)" Jasper Yu (1): Fixed Netbox API Path src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.39.1 --- End Message --- ___ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
[pve-devel] [PATCH pve-network 1/1] Fixed Netbox API Path
--- Begin Message ---
---
src/PVE/Network/SDN/Ipams/NetboxPlugin.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
index 91010bb..666ea70 100644
--- a/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
+++ b/src/PVE/Network/SDN/Ipams/NetboxPlugin.pm
@@ -288,7 +288,7 @@ sub get_ip_id {
sub is_ip_gateway {
my ($url, $ip, $headers) = @_;
-my $result = PVE::Network::SDN::api_request("GET",
"$url/addresses/search/$ip", $headers);
+my $result = PVE::Network::SDN::api_request("GET",
"$url/ipam/ip-addresses/?q=$ip", $headers);
my $data = @{$result->{data}}[0];
my $description = $data->{description};
my $is_gateway = 1 if $description eq 'gateway';
--
2.39.1
--- End Message ---
___
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
