Commit Graph

4444 Commits

Author SHA1 Message Date
Dominik Csapak
47d13c02b0 fix #2267: delete address(6) and netmas(6) with cidr(6)
otherwise a user cannot delete an ip from an interface

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-08 19:19:15 +02:00
Fabian Grünbichler
aa43978d16 build: bump versioned dependency on pve-cluster
needed for PVE::Corosync::resolve_hostname_like_corosync

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-08 10:44:41 +02:00
Fabian Grünbichler
82662dc83a 5to6: make corosync totem checks more verbose
to avoid just printing the subheader with no results

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-08 10:44:41 +02:00
Fabian Grünbichler
a2e5aa4e3e 5to6: add more corosync subheaders
to improve readability

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-08 10:44:41 +02:00
Fabian Grünbichler
d1dcb3e96e 5to6: fail if a corosync node has neither ring0 nor ring1 defined
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-08 10:44:41 +02:00
Fabian Grünbichler
b481d354c8 5to6: reword/-structure corosync message
and fix a typo as well

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-08 10:44:41 +02:00
Fabian Grünbichler
0e78b5157e 5to6: attempt to resolve corosync rings
and only fail if unable to

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2019-07-08 10:44:41 +02:00
Thomas Lamprecht
cc6bb2ec3e update shipped aplinfo index
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-08 07:52:34 +02:00
Thomas Lamprecht
7b6c78818c followup: balance columns
having this new selector on the left column makes it a better fit for
both possible edit situations, rootfs is now fully balanced and both
mp/rootfs kip the "skip replication" setting on the same place - in
sync with VMs

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-05 18:55:09 +02:00
Oguz Bektas
c115473dae fix #1451: allow some extra mount options for container
This allows the following non-problematic mount options for lxc
container mountpoints:
* noexec - Do not permit execution of binaries on the mounted FS
* noatime - Do not update inode access times on this filesystem
* nosuid - Do not allow suid or sgid bits to take effect
* nodev - Do not interpret character or block devices on the FS

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
2019-07-05 18:50:04 +02:00
Thomas Lamprecht
f9bbe5feac followup: hide mask, level and RO by default
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-05 12:30:28 +02:00
Dominik Csapak
3af21bae7e gui: ceph: show config database under the config
the column titles are the same as the 'ceph config dump' cli

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-05 09:52:58 +02:00
Dominik Csapak
21e413dc01 ceph: add api call for config database
simply returns the database content

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-05 09:52:58 +02:00
Thomas Lamprecht
93580fec68 use new url
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 17:57:27 +02:00
Thomas Lamprecht
36ee2702f8 bump version to 6.0-1
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 17:10:23 +02:00
Dominik Csapak
0b50996da5 ceph: remove obsolete ceph.service and do not distribute it anymore
in nautilus there is no ceph-disk anymore and osd activation
does not use udev anymore so this service is not needed anymore

remove it and do not copy it when installing a new ceph cluster

in pve-storage.target we replace ceph.service with ceph.target

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 17:09:48 +02:00
Thomas Lamprecht
cf06393a7a pveceph install: set repo URL to download.proxmox.com nautilus repo
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 15:52:51 +02:00
Dominik Csapak
9e5460013f gui: ceph: parse the whole message for monitor ids
sometimes a monitor id is only mentioned in a later part of the message
not always the first

for example, if more than one monitor is missing the msgr2 protocol
each monitor gets its own line

before this patch the whole error would only be attributed to the first
monitor mentioned, now it is attributed to all

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
2019-07-04 15:38:12 +02:00
Thomas Lamprecht
99181ca860 5to6: only tell to solve problems if fails are present
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 15:32:35 +02:00
Thomas Lamprecht
c50590ef72 5to6: improve final note on errors and/or warning a bit
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
2019-07-04 15:30:54 +02:00
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