Commit Graph

5174 Commits

Author SHA1 Message Date
Thomas Lamprecht
0e788b3e07 5to6: fiy typo: s/detailled/detailed/
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 15:23:19 +02:00
Thomas Lamprecht
3724703551 5to6: check common services pveproxy pvedaemon pvestatd
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 15:20:28 +02:00
Thomas Lamprecht
14886691a2 5to6: add log_systemd_unit_state and use for pve-cluster and corosync
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 15:20:28 +02:00
Thomas Lamprecht
bd6a59c2d3 5to6: import run_command
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 14:56:50 +02:00
Thomas Lamprecht
5c420879bf 5to6: clarify "cluster quorate" message a bit
As this is the state from the pmxcfs

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 14:21:10 +02:00
Thomas Lamprecht
23a60185fb 5to6: fixup: really set $total_votes to 0 if not defined
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 14:20:41 +02:00
Fabian Grünbichler
6ab8927e85 5to6: drop detailed quorumtool output
since we already print most of that anyway, and it is rather long.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 14:06:13 +02:00
Fabian Grünbichler
82fd088c0d 5to6: more quorum / vote checking
handle expected votes set to non-standard value, and try to adjust
calculations for qdevice setups.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 14:06:13 +02:00
Fabian Grünbichler
5d54e2ee38 5to6: quote some Ceph flags/options
to improve readability

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 11:37:17 +02:00
Fabian Grünbichler
880563233c 5to6: check for ceph global keyring config
which causes issues after upgrading to Nautilus.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 11:37:17 +02:00
Thomas Lamprecht
60b81f16cf 5to6: followup: also detect ceph conf keys separated with -
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 10:37:35 +02:00
Thomas Lamprecht
f9f8cd7d01 5to6: ceph mon host check: switch config check from defined to hash values exist
we can get here if a empty (or one with just comments) ceph.conf
exists

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 10:31:08 +02:00
Thomas Lamprecht
780a57b6d1 5to6: ceph global mon host check: also detect mon-host
and adapt message a bit

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 10:30:39 +02:00
Dominik Csapak
38bd1ffc17 pve5to6: check ipv6/ipv4 settings in ceph.conf
having ipv6 enabled while not disabling ipv4 prevents
nautilus osds to start if no ipv4 network is given (because they
are trying to bind to both ip families and die if one of them
is not found)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 10:23:36 +02:00
Dominik Csapak
c553da9283 pve5to6: check ceph config for mon_host line
this already works on luminous, so it does not harm to add it already,
and is recommended when both msgr1 and msgr2 is activated in nautilus

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 10:23:36 +02:00
Dominik Csapak
351d128f80 ceph: mon create: add known monitor ips to mon_host if it is empty
this fixes an issue where only one monitor is in mon_host, which is
offline, prevents a client connection

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 09:57:50 +02:00
Dominik Csapak
342de4e778 ceph: services: improve addr selection
we map '$type addr' to '$type_addr' anyway in the ceph.conf parser,
so this is not necessary

also use 'public_addr' if it is set

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 09:57:50 +02:00
Dominik Csapak
217dde83f0 ceph: osd: use get-or-create to create a bootstrap-osd key on demand
if for some reason the cluster does not have this key, generate it

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 09:57:50 +02:00
Dominik Csapak
7712a4e151 ceph: osd create: check for auth before getting bootstrap key
we do not need it if auth is 'none'

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 09:57:50 +02:00
Fabian Grünbichler
a1687fd928 5to6: invert check for noout for nautilus
mainly because it looks strange to get a warning after the upgrade is
finished and noout has been removed again

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 09:36:48 +02:00
Thomas Lamprecht
3323207150 5to6: followup: still include nodename in IP check
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 09:36:48 +02:00
Fabian Grünbichler
6a494e2e47 5to6: reuse $nodename
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 09:36:48 +02:00
Fabian Grünbichler
6c9e9cc83f 5to6: improve some log messages
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 09:36:48 +02:00
Thomas Lamprecht
b8bdb17eb5 5to6: followup sheepdog message
do not suggest that we ever supported it as first class storage, it
was always just a experimental support and upstream is
EOL/unmaintained now.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 09:36:48 +02:00
Fabian Grünbichler
68f0d1611b 5to6: add check for configured Sheepdog storages
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-04 09:30:15 +02:00
Thomas Lamprecht
8ec913c1cc followup: do not use string comparision for integers
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-03 15:34:19 +02:00
Tim Marx
2fb592ddbe api: ceph: automatically create manager after the first monitor
Signed-off-by: Tim Marx <t.marx@proxmox.com>
2019-07-03 15:34:19 +02:00
Fabian Grünbichler
50d5fd6ab0 ceph: init: fix undef var access
Fixes: d851d63ecc
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-03 15:10:02 +02:00
Thomas Lamprecht
6deabaacf1 5to6: improve ceph warning on non OK state
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-03 13:14:28 +02:00
Dominik Csapak
d851d63ecc ceph: init: only handle keyring if auth is cephx
if auth is 'none' there is no client keyring, so do not generate it and
do not write it into the config

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-03 11:34:34 +02:00
Dominik Csapak
94b79c8e73 gui: ceph: fix syslog resize
makes the logview inside resize with the window

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-02 13:29:22 +02:00
Thomas Lamprecht
b6c10c6392 pve5to6: be a bit more verbose for misc. checks
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-02 12:09:50 +02:00
Thomas Lamprecht
000acacacc pve5to6: followup: improve coding style and outputs a bit
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-02 12:09:46 +02:00
Dominik Csapak
03f79391c0 pve5to6: list vms with active vmx/svm flag
list all vms with either max/host cputype or vmx/svm explicitely set
(this can only happen in the args)

give a general message if none is found at the moment (and do not warn)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-02 11:39:10 +02:00
Dominik Csapak
ac1308a79d gui: ceph pools: fix pool % used display
nautilus uses values from 0 to 1 instead of 0 to 100

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-02 10:40:16 +02:00
Thomas Lamprecht
5dff9157df api: subscription: return https backed link
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-01 15:00:27 +02:00
Thomas Lamprecht
bbabe0bf75 bump version to 6.0-0+4
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 20:42:13 +02:00
Thomas Lamprecht
2659fca10b d/control: update version dependency of proxmox-widget-toolkit
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 20:42:13 +02:00
Thomas Lamprecht
c92c54d54b api: backup pool: enforce VM.Backup permissions on pool also on create
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 20:04:04 +02:00
Thomas Lamprecht
5ab9a24383 api2tools: refactor get_resource_pool_guest_members and declare missing use
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 19:46:44 +02:00
Thomas Lamprecht
16f5b2834e api: backup pool: enforce VM.Backup permissions on pool
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 19:29:46 +02:00
Thomas Lamprecht
a82afef0b9 ui: pool backup: adapt labels a bit
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 19:20:24 +02:00
Tim Marx
ab64886987 fix #1278 gui: backup: add backup mode pool
Signed-off-by: Tim Marx <t.marx@proxmox.com>
2019-06-28 18:05:19 +02:00
Tim Marx
f337626155 fix #1278 api: add pool backup option
Signed-off-by: Tim Marx <t.marx@proxmox.com>
2019-06-28 18:05:19 +02:00
Tim Marx
60e049c231 whitespace cleanup
Signed-off-by: Tim Marx <t.marx@proxmox.com>
2019-06-28 18:01:04 +02:00
Tim Marx
c54f9a758d ui: migrate: add storage and size information to preconditions
Signed-off-by: Tim Marx <t.marx@proxmox.com>
2019-06-28 17:42:21 +02:00
Dominik Csapak
b8c37fdae1 ceph: disallow ipv4 in new cluster when ipv6 is enabled
ms_bind_ipv4 is default true and osds look for both
ipv6 and ipv4 addresses in cluster network/public network

since we only allow for one network each (which must be either
ipv4 or ipv6) we disallow ipv4 if ipv6 is detected

this fixes not starting osds on an ipv6 enabled, newly-setup cluster

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-06-28 15:14:04 +02:00
Dominik Csapak
78f99813bb ceph: mon create: fix not starting monitor if no public_addr is in conf
when there is no 'public_network' in the config, the monitor
can only find an ip if it is given explicitly, either via commandline
(not possible with systemd) or via the ceph.conf

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-06-28 14:23:23 +02:00
Thomas Lamprecht
696a8cac2d silent some lintian warnings
"privacy-breach-generic" is  a false positive here (lintian bug
907957)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 11:30:00 +02:00
Thomas Lamprecht
70bf844a14 d/maintscript: really remove the old apt hook for kernel
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-06-28 11:29:50 +02:00