]>
git.apps.os.sepia.ceph.com Git - teuthology.git/log
Kyr Shatskyy [Mon, 23 Mar 2020 22:24:31 +0000 (23:24 +0100)]
orchestra/run: fix string handling
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sun, 15 Mar 2020 00:26:06 +0000 (01:26 +0100)]
suite/util: add debug log for sha1s response
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 14 Mar 2020 23:33:17 +0000 (00:33 +0100)]
py3: get rid of cStringIO
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 14 Mar 2020 23:27:30 +0000 (00:27 +0100)]
py3: fix teuthology version banner for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 14 Mar 2020 23:22:37 +0000 (00:22 +0100)]
task/kernel: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Wed, 11 Dec 2019 21:20:24 +0000 (22:20 +0100)]
tox: enable py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 02:09:50 +0000 (03:09 +0100)]
tox: enable flake8-py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Mar 2020 13:34:03 +0000 (14:34 +0100)]
task/ansible: fix mock issue in test_ansible
Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 14 Dec 2019 01:22:07 +0000 (02:22 +0100)]
misc: get_file must use mode='rb' for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 14 Dec 2019 00:19:58 +0000 (01:19 +0100)]
orchestra/daemon/systemd: get rid of cStringIO for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Thu, 5 Mar 2020 16:34:11 +0000 (17:34 +0100)]
bootstrap: use python version based required packages
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 23 Nov 2019 17:06:40 +0000 (18:06 +0100)]
packaging: make sure _get_repo returns str
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Kefu Chai [Fri, 13 Mar 2020 09:11:54 +0000 (17:11 +0800)]
Merge pull request #1419 from toabctl/drop-coverage-cmd
Drop teuthology-coverage command
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
kshtsk [Fri, 13 Mar 2020 09:06:03 +0000 (10:06 +0100)]
Merge pull request #1421 from kshtsk/wip-cluster-sh
orchestra/cluster: add sh() method
Kefu Chai [Fri, 13 Mar 2020 05:56:19 +0000 (13:56 +0800)]
Merge pull request #1420 from kshtsk/wip-pump-markupsafe
requirements: bump up markupsafe to 1.1.1
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kyr Shatskyy [Thu, 12 Mar 2020 16:09:26 +0000 (17:09 +0100)]
requirements: bump up markupsafe to 1.1.1
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Thu, 12 Mar 2020 16:32:33 +0000 (17:32 +0100)]
orchestra/cluster: add sh() method
For simplified outputs processing it might be usefull
to have a function will return all captured log from
all remote hosts in the given sequence.
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Thomas Bechtold [Tue, 10 Mar 2020 18:56:11 +0000 (19:56 +0100)]
Drop teuthology-coverage command
It seems to be unused and there was no change in the last 6 years. I
guess it's not used and not needed so drop it to remove the dead
code.
Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
kshtsk [Mon, 2 Mar 2020 12:46:13 +0000 (13:46 +0100)]
Merge pull request #1372 from ryg-/wip-suse-hw-provisioning
provision: add Pelagos support
Roman Grigoryev [Fri, 26 Jul 2019 14:41:55 +0000 (16:41 +0200)]
provision: add Pelagos support
Add provisioning support via Pelagos provisioner
https://github.com/SUSE/pelagos/
Pelagos is pxe boot and provisioning system which created especially
for connecting bare metal nodes to ceph/teuthology testing system.
Integration tests here pelagos/test_pelagos_teuthology/test_pelagos.py
because depends on executed Pelagios service
For enabling pelagos you need add section to teuthology configuration:
pelagos:
endpoint: http://your.server.host:5000/
machine_types: ['type1', 'type2', 'type3']
provision/pelagos.py: added support of Pelagos provisioning project,
interface is compatible with FOG provisioner
provision/__init.py: added processing of pelagos section in teuthology
configuration and provisioner instantiation
lock/*: added Pelagos provisioner instantiation
nuke/__init__.py: added call to pelagos module for nodes, which are
controlled by pelagos, for booting to live images.
Signed-off-by: Roman Grigorev <rgrigorev@suse.de>
kshtsk [Fri, 28 Feb 2020 21:17:28 +0000 (22:17 +0100)]
Merge pull request #1404 from gekios/wip-libcloud_update
use libcloud 2.8.0 version
Georgios Kyratsas [Fri, 10 Jan 2020 13:55:59 +0000 (14:55 +0100)]
use libloud 2.8.0 version
Suggesting using 2.8.0 version of apache-libcloud that introduces
a fix on openstack driver.
(https://github.com/apache/libcloud/pull/1367 is fixing issue
https://github.com/apache/libcloud/issues/1365)
Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
David Galloway [Thu, 20 Feb 2020 19:48:09 +0000 (14:48 -0500)]
Merge pull request #1415 from smithfarm/wip-install-shaman-suse
packaging: remove zypper repo kludge
Nathan Cutler [Thu, 20 Feb 2020 16:59:27 +0000 (17:59 +0100)]
packaging: remove zypper repo kludge
Now that https://github.com/ceph/chacra/pull/275 has been merged and
deployed, we can write this code without any kludge.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Wed, 19 Feb 2020 08:53:36 +0000 (09:53 +0100)]
Merge pull request #1413 from smithfarm/wip-44187
task/kernel: after reboot, do not try to reconnect immediately
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Nathan Cutler [Wed, 19 Feb 2020 08:53:18 +0000 (09:53 +0100)]
Merge pull request #1412 from smithfarm/wip-43655
packaging: add Shaman repo correctly on opensuse
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Nathan Cutler [Wed, 19 Feb 2020 08:52:45 +0000 (09:52 +0100)]
Merge pull request #1411 from smithfarm/wip-opensuse-kernel-distro-2
kernel.py: fix -k distro for opensuse/sle (part 2)
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Luis Henriques <lhenriques@suse.com>
Josh Durgin [Tue, 18 Feb 2020 21:32:18 +0000 (13:32 -0800)]
Merge pull request #1410 from badone/wip-smithi-lvm-scratch-disks
task/ceph_ansible: Work with LVM scratch devices
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Tue, 18 Feb 2020 20:01:17 +0000 (21:01 +0100)]
task/kernel: after reboot, do not try to reconnect immediately
Do not try to reconnect immediately after triggering the reboot,
because the reboot sequence might not have started yet (!)
Fixes: https://tracker.ceph.com/issues/44187
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 18 Feb 2020 14:34:03 +0000 (15:34 +0100)]
packaging: add Shaman repo correctly on opensuse
Fixes: https://tracker.ceph.com/issues/43655
Works Around: https://tracker.ceph.com/issues/44183
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 18 Feb 2020 12:12:24 +0000 (13:12 +0100)]
kernel.py: fix -k distro for opensuse/sle (part 2)
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 18 Feb 2020 09:36:50 +0000 (10:36 +0100)]
Merge pull request #1408 from smithfarm/wip-kernel-distro-opensuse
task/kernel.py: fix -k distro for opensuse/sle (part 1)
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Brad Hubbard [Mon, 17 Feb 2020 23:14:01 +0000 (09:14 +1000)]
task/ceph_ansible: Work with LVM scratch devices
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Nathan Cutler [Tue, 21 Jan 2020 15:55:37 +0000 (16:55 +0100)]
task/kernel.py: fix -k distro for opensuse/sle
Part one - this does not get us all the way, but it's a start!
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Kefu Chai [Sat, 15 Feb 2020 03:04:33 +0000 (11:04 +0800)]
Merge pull request #1409 from kshtsk/wip-pump-six
requirements: pip-compile -P six
Reviewed-by: Kefu Chai <kchai@redhat.com>
kshtsk [Fri, 14 Feb 2020 20:27:34 +0000 (21:27 +0100)]
Merge pull request #1407 from kshtsk/wip-archive-dir
worker_start: allow ARCHIVE variable override
Kyr Shatskyy [Fri, 14 Feb 2020 19:03:45 +0000 (20:03 +0100)]
requirements: pip-compile -P six
We need to pump six to the latest 1.14.0 so we have
six.ensure_str() is available
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Tue, 11 Feb 2020 15:56:45 +0000 (16:56 +0100)]
worker_start: allow ARCHIVE variable override
The worker_start.sh script is using archive directory inside
the worker user home which cannot be changed, this patches
allows override ARCHIVE environment variable to address
this issue.
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Josh Durgin [Fri, 7 Feb 2020 02:55:45 +0000 (18:55 -0800)]
Merge pull request #1405 from rzarzynski/wip-hammer-sh-do-not-nuke
hammer.sh: don't do teuthology-nuke anymore.
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Radoslaw Zarzynski [Wed, 5 Feb 2020 17:19:05 +0000 (18:19 +0100)]
hammer.sh: don't do teuthology-nuke anymore.
Apparently `hammer.sh` is pretty old. It calls `teuthology-nuke`
expecting the further call to `teuhology` will be able to still
reach the nodes. However, it doesn't seem that anybody is turning
them back these days.
The commit just drops the `teuthology-nuke` call.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Sage Weil [Tue, 28 Jan 2020 16:34:51 +0000 (10:34 -0600)]
Merge pull request #1403 from badone/wip-ceph-ansible-cryptography-incompatible
ceph_ansible: Make sure cryptography version is compatible
Sage Weil [Tue, 28 Jan 2020 16:34:17 +0000 (10:34 -0600)]
Merge pull request #1402 from badone/wip-ceph-ansible-virtualenv-force-python3
ceph_ansible: Enforce python3 for virtualenv
Sage Weil [Tue, 28 Jan 2020 16:33:47 +0000 (10:33 -0600)]
Merge pull request #1401 from badone/wip-ceph-ansible-args-attribute-error
ceph_ansible: Make ceph_installer.run args consistent
Brad Hubbard [Tue, 28 Jan 2020 06:54:59 +0000 (16:54 +1000)]
ceph_ansible: Make sure cryptography version is compatible
Fixes: https://tracker.ceph.com/issues/43843
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Brad Hubbard [Tue, 28 Jan 2020 02:32:04 +0000 (12:32 +1000)]
ceph_ansible: Enforce python3 for virtualenv
Fixes: https://tracker.ceph.com/issues/43799
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Brad Hubbard [Tue, 28 Jan 2020 00:58:13 +0000 (10:58 +1000)]
ceph_ansible: Make ceph_installer.run args consistent
Fixes: https://tracker.ceph.com/issues/43798
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Patrick Donnelly [Fri, 24 Jan 2020 17:17:46 +0000 (09:17 -0800)]
Merge PR #1400 into master
* refs/pull/1400/head:
selinux: use text processing for audit.log
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Patrick Donnelly [Thu, 23 Jan 2020 23:20:52 +0000 (15:20 -0800)]
selinux: use text processing for audit.log
We ran into some odd grep bug treating the audit.log as binary and
wrongly returning a match result.
Fixes: https://tracker.ceph.com/issues/43797
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
kshtsk [Thu, 23 Jan 2020 08:23:03 +0000 (09:23 +0100)]
Merge pull request #1369 from ryg-/wip-fix-opensuse-provisioning
Fix opensuse provisioning support
Gregory Farnum [Tue, 21 Jan 2020 14:43:27 +0000 (06:43 -0800)]
Merge pull request #1398 from smithfarm/wip-teuthology-branch-sha1
suite/run.py: provide teuthology hash along with branch
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.de>
Sage Weil [Sat, 18 Jan 2020 01:12:21 +0000 (19:12 -0600)]
Merge pull request #1399 from ceph/fix-cephadm-logs
orchestra/daemon/cephadmunit: use journalctl to monitor stdout/err
Sage Weil [Fri, 17 Jan 2020 22:58:52 +0000 (22:58 +0000)]
orchestra/daemon/cephadmunit: use journalctl to monitor stdout/err
Using 'podman logs' is racy because the command may start before the
container starts, or even after it start and exits.
Signed-off-by: Sage Weil <sage@redhat.com>
Roman Grigoryev [Wed, 27 Nov 2019 12:14:28 +0000 (13:14 +0100)]
Fix opensuse provisioning support
task/selinux.py, orchestra/remote.py:
disable SELinux for opensuse/suse distros
nuke/actions.py:
added support for sle/opensuse distros
Signed-off-by: Roman Grigorev <rgrigorev@suse.de>
Nathan Cutler [Fri, 17 Jan 2020 21:36:21 +0000 (22:36 +0100)]
suite/run.py: provide teuthology hash along with branch
When running teuthology-suite with -t option, I see:
teuthology branch: wip-fix-opensuse-provisioning
ceph branch: wip-foo
eb2fd5065c6e489ca8dd9282ba62ab231f144f7a
In other words, the ceph branch message has the SHA1 but the
teuthology branch message does not. This commit adds it.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Kefu Chai [Thu, 16 Jan 2020 15:06:00 +0000 (23:06 +0800)]
Merge pull request #1396 from tchaikov/wip-podman-selinux
task/selinux: ignore SElinux denials caused by podman
Reviewed-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 16 Jan 2020 06:54:46 +0000 (14:54 +0800)]
task/selinux: ignore SElinux denials caused by podman
it's a workaround of https://tracker.ceph.com/issues/43635
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 16 Jan 2020 04:01:10 +0000 (12:01 +0800)]
Merge pull request #1394 from SUSE/bootstrap-setuptools-44
bootstrap: install setuptools 44
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
David Galloway [Wed, 15 Jan 2020 20:58:51 +0000 (15:58 -0500)]
Merge pull request #1395 from ceph/fix-sysctl-core
tasks/internal: put kernel.core_pattern in sysctl.conf too
Sage Weil [Wed, 15 Jan 2020 19:59:32 +0000 (13:59 -0600)]
tasks/internal: put kernel.core_pattern in sysctl.conf too
This way if systemd restarts or is reinstalled (as it is on el8 at the
moment) we won't lose this setting.
Signed-off-by: Sage Weil <sage@redhat.com>
Jan Fajerski [Wed, 15 Jan 2020 11:05:44 +0000 (12:05 +0100)]
bootstrap: install setuptools 44
With setuptools 45 python2 support was dropped.
Fixes: https://tracker.ceph.com/issues/43606
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
Kefu Chai [Thu, 9 Jan 2020 05:34:09 +0000 (13:34 +0800)]
Merge pull request #1383 from toabctl/worker-drop-dead-code
worker: Drop dead code handling old releases
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Mon, 6 Jan 2020 17:46:45 +0000 (01:46 +0800)]
Merge pull request #1391 from batrick/i43396
task/selinux: ignore recent rhel8 selinux denials
Reviewed-by: Kefu Chai <kchai@redhat.com>
Patrick Donnelly [Fri, 3 Jan 2020 23:19:20 +0000 (15:19 -0800)]
task/selinux: ignore recent rhel8 selinux denials
Fixes: https://tracker.ceph.com/issues/43396
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Mon, 23 Dec 2019 19:42:56 +0000 (13:42 -0600)]
Merge pull request #1390 from ceph/wip-centos8
orchestra/daemon/cephadmunit: implement kill, wait
Sage Weil [Mon, 23 Dec 2019 16:35:18 +0000 (16:35 +0000)]
orchestra/daemon/cephadmunit: implement kill, wait
These are both needed by thrashosds.
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Fri, 20 Dec 2019 11:10:56 +0000 (19:10 +0800)]
Merge pull request #1387 from tchaikov/wip-requires-paramiko
setup.py: move more modules back to "install_requires"
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kefu Chai [Tue, 17 Dec 2019 10:25:45 +0000 (18:25 +0800)]
setup.py: move paramiko back to "install_requires"
move following python modules back to "install_requires"
* apache-libcloud
* netaddr
* paramiko
they are imported even when teuthology is used by vstart_runner.py
Signed-off-by: Kefu Chai <kchai@redhat.com>
Thomas Bechtold [Fri, 13 Dec 2019 12:26:13 +0000 (13:26 +0100)]
worker: Drop dead code handling old releases
We no longer need to check for branches like 'argonaut', 'bobtail',
'cuttlefish' or 'dumpling'. These are long gone.
Removing the code simplifies it a bit.
Signed-off-by: Thomas Bechtold <tbechtold@suse.com>
Kefu Chai [Wed, 18 Dec 2019 10:24:23 +0000 (18:24 +0800)]
Merge pull request #1388 from tchaikov/wip-fix-could-not-find-an-image
provision: fix the error message when a distro image is not found
Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Kefu Chai [Wed, 18 Dec 2019 09:27:22 +0000 (17:27 +0800)]
provision: fix the error message when a distro image is not found
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Tue, 17 Dec 2019 00:39:31 +0000 (18:39 -0600)]
Merge pull request #1386 from ceph/fix-43335
task/kernel: fix typo
Sage Weil [Mon, 16 Dec 2019 23:29:45 +0000 (17:29 -0600)]
task/kernel: fix typo
menuentry, not menuitem.
Signed-off-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Mon, 16 Dec 2019 15:33:00 +0000 (16:33 +0100)]
Merge pull request #1385 from shangdehao1/master
task/install: fix UnboundLocalError of local variable repos
Reviewed-by: Nathan Cutler <ncutler@suse.com>
kshtsk [Mon, 16 Dec 2019 15:27:12 +0000 (16:27 +0100)]
Merge pull request #1382 from kshtsk/wip-cast-dict-keys
py3: cast dict keys to list
Sage Weil [Mon, 16 Dec 2019 14:14:12 +0000 (08:14 -0600)]
Merge pull request #1384 from ceph/wip-centos8
task/install/daemon-helper: python3
shangdehao1 [Sat, 14 Dec 2019 06:28:43 +0000 (14:28 +0800)]
task/install: fix UnboundLocalError of local variable repos
If overrides is None, repos will don't be assignmented.
In this case, will occur error "UnboundLocalError: local variable
repos referenced before assignment"
Signed-off-by: dehao.shang@intel.com
Sage Weil [Fri, 13 Dec 2019 19:57:53 +0000 (19:57 +0000)]
task/install/daemon-helper: python3
Signed-off-by: Sage Weil <sage@redhat.com>
Kyr Shatskyy [Fri, 13 Dec 2019 12:14:00 +0000 (13:14 +0100)]
test/fake_fs: fix tests for py3 compatibility
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 12:13:14 +0000 (13:13 +0100)]
test: replace __builtin__ with module path for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 11:40:47 +0000 (12:40 +0100)]
lock/ops: cast dict_keys to list for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 03:11:47 +0000 (04:11 +0100)]
task/internal/syslog: use remote.sh for py3 compat
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 03:08:28 +0000 (04:08 +0100)]
task/iscsi: use remote.sh instead of remote.run for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 02:08:55 +0000 (03:08 +0100)]
tox: add flake8-py3 env
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 01:34:28 +0000 (02:34 +0100)]
task/internal/vm_setup: get rid of cString import for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Fri, 13 Dec 2019 00:54:37 +0000 (01:54 +0100)]
orchestra/connection: cast 'key' to bytes for base64.decodestring
Because base64.decodestring accepts bytes, the key variable
should be converted from string obj.
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Thu, 12 Dec 2019 23:53:44 +0000 (00:53 +0100)]
worker: give a text file to yaml.safe_dump for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Thu, 12 Dec 2019 22:48:43 +0000 (23:48 +0100)]
py3: cast dict_keys to list
Addresses:
TypeError: 'dict_keys' object does not support indexing
and:
RuntimeError: dictionary changed size during iteration
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Sat, 23 Nov 2019 17:06:04 +0000 (18:06 +0100)]
prune: simplify expression for py3
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Sage Weil [Thu, 12 Dec 2019 22:06:39 +0000 (16:06 -0600)]
Merge pull request #1378 from ceph/wip-centos8
task/kernel,install: misc fixes for el8
Sage Weil [Thu, 12 Dec 2019 20:05:35 +0000 (20:05 +0000)]
task/kernel: don't fail if we're confused by grub
If we don't have menuitem in the grub conf, and we dn't see /boot/loader/entries
file, just don't do grub2-set-default at all and hope for the best. Worst
case we'll fail later because we didn't boot the right kernel.
Signed-off-by: Sage Weil <sage@redhat.com>
kshtsk [Thu, 12 Dec 2019 19:27:53 +0000 (20:27 +0100)]
Merge pull request #1380 from kshtsk/wip-py3-requirements
py3 requirements
Sage Weil [Wed, 11 Dec 2019 19:27:22 +0000 (19:27 +0000)]
task/kernel: adapt to el8 grub2 /boot/loader/entries/*.conf
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 11 Dec 2019 16:11:08 +0000 (16:11 +0000)]
task/kernel: drop removal of old kernels
1- this isn't necessary anymore with fog
2- the package-cleanup --oldkernels option doesn't exist in el8
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 11 Dec 2019 17:23:20 +0000 (17:23 +0000)]
task/kernel: fix grub2 detection
grub2 rpm doesn't exist... el8 has
grub2-tools-extra-2.02-66.el8.x86_64
grub2-pc-modules-2.02-66.el8.noarch
grub2-tools-2.02-66.el8.x86_64
grub2-pc-2.02-66.el8.x86_64
grubby-8.40-34.el8.x86_64
grub2-common-2.02-66.el8.noarch
grub2-tools-minimal-2.02-66.el8.x86_64
and el7 has
grub2-tools-minimal-2.02-0.76.el7.centos.x86_64
grub2-pc-2.02-0.76.el7.centos.x86_64
grub2-common-2.02-0.76.el7.centos.noarch
grub2-tools-extra-2.02-0.76.el7.centos.x86_64
grubby-8.28-25.el7.x86_64
grub2-pc-modules-2.02-0.76.el7.centos.noarch
grub2-tools-2.02-0.76.el7.centos.x86_64
grub2-2.02-0.76.el7.centos.x86_64
The difference seems to be that el7 *also* has a /boot/grub directory. Let's
hope this change doesn't break it!
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 11 Dec 2019 19:31:45 +0000 (19:31 +0000)]
task/install: make sure /etc/yum/plugin.conf.d/priorities.conf exists
If it doesn' teh subsequent commands all fail.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 11 Dec 2019 17:04:15 +0000 (17:04 +0000)]
misc: get_system_type: RedHatEnterprise is RHEL
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 12 Dec 2019 18:37:52 +0000 (12:37 -0600)]
Merge pull request #1381 from ceph/wip-cephadm
orchestra: ceph-daemon -> cephadm
Sage Weil [Thu, 12 Dec 2019 16:43:02 +0000 (16:43 +0000)]
orchestra: ceph-daemon -> cephadm
Signed-off-by: Sage Weil <sage@redhat.com>
Kyr Shatskyy [Thu, 12 Dec 2019 16:19:13 +0000 (17:19 +0100)]
tox: use requirements3.txt for py3 env
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Thu, 12 Dec 2019 16:18:20 +0000 (17:18 +0100)]
tox: requirements.txt -> requirement2.txt
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>