]> git.apps.os.sepia.ceph.com Git - teuthology.git/log
teuthology.git
5 years agoorchestra/cluster: add sh() method 1421/head
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>
5 years agoMerge pull request #1372 from ryg-/wip-suse-hw-provisioning
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

5 years agoprovision: add Pelagos support 1372/head
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>
5 years agoMerge pull request #1404 from gekios/wip-libcloud_update
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

5 years agouse libloud 2.8.0 version 1404/head
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>
5 years agoMerge pull request #1415 from smithfarm/wip-install-shaman-suse
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

5 years agopackaging: remove zypper repo kludge 1415/head
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>
5 years agoMerge pull request #1413 from smithfarm/wip-44187
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>
5 years agoMerge pull request #1412 from smithfarm/wip-43655
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>
5 years agoMerge pull request #1411 from smithfarm/wip-opensuse-kernel-distro-2
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>
5 years agoMerge pull request #1410 from badone/wip-smithi-lvm-scratch-disks
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>
5 years agotask/kernel: after reboot, do not try to reconnect immediately 1413/head
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>
5 years agopackaging: add Shaman repo correctly on opensuse 1412/head
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>
5 years agokernel.py: fix -k distro for opensuse/sle (part 2) 1411/head
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>
5 years agoMerge pull request #1408 from smithfarm/wip-kernel-distro-opensuse
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>
5 years agotask/ceph_ansible: Work with LVM scratch devices 1410/head
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>
5 years agotask/kernel.py: fix -k distro for opensuse/sle 1408/head
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>
5 years agoMerge pull request #1409 from kshtsk/wip-pump-six
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>
5 years agoMerge pull request #1407 from kshtsk/wip-archive-dir
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

5 years agorequirements: pip-compile -P six 1409/head
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>
5 years agoworker_start: allow ARCHIVE variable override 1407/head
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>
5 years agoMerge pull request #1405 from rzarzynski/wip-hammer-sh-do-not-nuke
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>
5 years agohammer.sh: don't do teuthology-nuke anymore. 1405/head
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>
5 years agoMerge pull request #1403 from badone/wip-ceph-ansible-cryptography-incompatible
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

5 years agoMerge pull request #1402 from badone/wip-ceph-ansible-virtualenv-force-python3
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

5 years agoMerge pull request #1401 from badone/wip-ceph-ansible-args-attribute-error
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

5 years agoceph_ansible: Make sure cryptography version is compatible 1403/head
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>
5 years agoceph_ansible: Enforce python3 for virtualenv 1402/head
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>
5 years agoceph_ansible: Make ceph_installer.run args consistent 1401/head
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>
5 years agoMerge PR #1400 into master
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>
5 years agoselinux: use text processing for audit.log 1400/head
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>
5 years agoMerge pull request #1369 from ryg-/wip-fix-opensuse-provisioning
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

5 years agoMerge pull request #1398 from smithfarm/wip-teuthology-branch-sha1
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>
5 years agoMerge pull request #1399 from ceph/fix-cephadm-logs
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

5 years agoorchestra/daemon/cephadmunit: use journalctl to monitor stdout/err 1399/head
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>
5 years agoFix opensuse provisioning support 1369/head
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>
5 years agosuite/run.py: provide teuthology hash along with branch 1398/head
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>
5 years agoMerge pull request #1396 from tchaikov/wip-podman-selinux
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>
5 years agotask/selinux: ignore SElinux denials caused by podman 1396/head
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>
5 years agoMerge pull request #1394 from SUSE/bootstrap-setuptools-44
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>
5 years agoMerge pull request #1395 from ceph/fix-sysctl-core
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

5 years agotasks/internal: put kernel.core_pattern in sysctl.conf too 1395/head
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>
5 years agobootstrap: install setuptools 44 1394/head
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>
5 years agoMerge pull request #1383 from toabctl/worker-drop-dead-code
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>
5 years agoMerge pull request #1391 from batrick/i43396
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>
5 years agotask/selinux: ignore recent rhel8 selinux denials 1391/head
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>
5 years agoMerge pull request #1390 from ceph/wip-centos8
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

5 years agoorchestra/daemon/cephadmunit: implement kill, wait 1390/head
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>
5 years agoMerge pull request #1387 from tchaikov/wip-requires-paramiko
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>
5 years agosetup.py: move paramiko back to "install_requires" 1387/head
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>
5 years agoworker: Drop dead code handling old releases 1383/head
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>
5 years agoMerge pull request #1388 from tchaikov/wip-fix-could-not-find-an-image
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>
5 years agoprovision: fix the error message when a distro image is not found 1388/head
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>
5 years agoMerge pull request #1386 from ceph/fix-43335
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

5 years agotask/kernel: fix typo 1386/head
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>
5 years agoMerge pull request #1385 from shangdehao1/master
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>
5 years agoMerge pull request #1382 from kshtsk/wip-cast-dict-keys
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

5 years agoMerge pull request #1384 from ceph/wip-centos8
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

5 years agotask/install: fix UnboundLocalError of local variable repos 1385/head
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
5 years agotask/install/daemon-helper: python3 1384/head
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>
5 years agotest/fake_fs: fix tests for py3 compatibility 1382/head
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>
5 years agotest: replace __builtin__ with module path for py3
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>
5 years agolock/ops: cast dict_keys to list for py3
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>
5 years agotask/internal/syslog: use remote.sh for py3 compat
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>
5 years agotask/iscsi: use remote.sh instead of remote.run for py3
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>
5 years agotox: add flake8-py3 env
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>
5 years agotask/internal/vm_setup: get rid of cString import for py3
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>
5 years agoorchestra/connection: cast 'key' to bytes for base64.decodestring
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>
5 years agoworker: give a text file to yaml.safe_dump for py3
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>
5 years agopy3: cast dict_keys to list
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>
5 years agoprune: simplify expression for py3
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>
5 years agoMerge pull request #1378 from ceph/wip-centos8
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

5 years agotask/kernel: don't fail if we're confused by grub 1378/head
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>
5 years agoMerge pull request #1380 from kshtsk/wip-py3-requirements
kshtsk [Thu, 12 Dec 2019 19:27:53 +0000 (20:27 +0100)]
Merge pull request #1380 from kshtsk/wip-py3-requirements

py3 requirements

5 years agotask/kernel: adapt to el8 grub2 /boot/loader/entries/*.conf
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>
5 years agotask/kernel: drop removal of old kernels
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>
5 years agotask/kernel: fix grub2 detection
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>
5 years agotask/install: make sure /etc/yum/plugin.conf.d/priorities.conf exists
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>
5 years agomisc: get_system_type: RedHatEnterprise is RHEL
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>
5 years agoMerge pull request #1381 from ceph/wip-cephadm
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

5 years agoorchestra: ceph-daemon -> cephadm 1381/head
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>
5 years agotox: use requirements3.txt for py3 env 1380/head
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>
5 years agotox: requirements.txt -> requirement2.txt
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>
5 years agorequirements: pip-compile -P paramiko
Kyr Shatskyy [Thu, 12 Dec 2019 16:01:58 +0000 (17:01 +0100)]
requirements: pip-compile -P paramiko

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agorequirements: pip-compile -P cryptography
Kyr Shatskyy [Thu, 12 Dec 2019 15:59:37 +0000 (16:59 +0100)]
requirements: pip-compile -P cryptography

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agorequirements: pip-compile -P pexpect
Kyr Shatskyy [Thu, 12 Dec 2019 15:57:46 +0000 (16:57 +0100)]
requirements: pip-compile -P pexpect

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agorequirements: pip-compile -P pip-tools
Kyr Shatskyy [Thu, 12 Dec 2019 15:53:26 +0000 (16:53 +0100)]
requirements: pip-compile -P pip-tools

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agopy3: add requirements file
Kyr Shatskyy [Thu, 12 Dec 2019 15:48:14 +0000 (16:48 +0100)]
py3: add requirements file

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agobootstrap: use separate requirements file for py3
Kyr Shatskyy [Thu, 12 Dec 2019 15:41:57 +0000 (16:41 +0100)]
bootstrap: use separate requirements file for py3

Because pip-compile produces different set of packages
for different python versions it needs to have
a dedicated requirements.txt for py2 and py3.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agotox: add py3 env
Kyr Shatskyy [Wed, 11 Dec 2019 03:22:53 +0000 (04:22 +0100)]
tox: add py3 env

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agobootstrap: add PYTHON and VENV variables
Kyr Shatskyy [Wed, 11 Dec 2019 00:30:26 +0000 (01:30 +0100)]
bootstrap: add PYTHON and VENV variables

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
5 years agoMerge pull request #1379 from tchaikov/wip-43192
Kefu Chai [Thu, 12 Dec 2019 07:35:32 +0000 (15:35 +0800)]
Merge pull request #1379 from tchaikov/wip-43192

setup.py: add missing dependencies of tests

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
5 years agosetup.py: add missing dependencies of tests 1379/head
Kefu Chai [Thu, 12 Dec 2019 04:56:19 +0000 (12:56 +0800)]
setup.py: add missing dependencies of tests

Fixes: https://tracker.ceph.com/issues/43192
Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agodocs: document the fix for incompatible pip-tools with newer pip
Kefu Chai [Thu, 12 Dec 2019 04:43:04 +0000 (12:43 +0800)]
docs: document the fix for incompatible pip-tools with newer pip

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agosetup.py: move more tests related deps to "test"
Kefu Chai [Thu, 12 Dec 2019 03:14:07 +0000 (11:14 +0800)]
setup.py: move more tests related deps to "test"

Signed-off-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #1375 from ceph/wip-centos8
David Galloway [Wed, 11 Dec 2019 00:08:13 +0000 (19:08 -0500)]
Merge pull request #1375 from ceph/wip-centos8

orchestra/opsys: enable centos 8

5 years agoorchestra/opsys: enable centos 8 1375/head
Sage Weil [Tue, 10 Dec 2019 18:54:09 +0000 (18:54 +0000)]
orchestra/opsys: enable centos 8

Signed-off-by: Sage Weil <sage@redhat.com>
5 years agoMerge pull request #1374 from ceph/wip-valgrind-file
kshtsk [Tue, 10 Dec 2019 10:13:10 +0000 (11:13 +0100)]
Merge pull request #1374 from ceph/wip-valgrind-file

valgrind.supp is used from ceph/qa

5 years agovalgrind.supp is used from ceph/qa, we should remove this from setup to avoid 1374/head
Vasu Kulkarni [Tue, 10 Dec 2019 03:12:21 +0000 (19:12 -0800)]
valgrind.supp is used from ceph/qa, we should remove this from setup to avoid
any confusion

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
5 years agoMerge pull request #1373 from kshtsk/wip-opensuse-distro-defaults
kshtsk [Tue, 10 Dec 2019 00:33:25 +0000 (01:33 +0100)]
Merge pull request #1373 from kshtsk/wip-opensuse-distro-defaults

suite/util: add opensuse to distro defaults