4ca64cd71889f793e351640f4e0fa4622815549b
Commit Graph

127 Commits

Author SHA1 Message Date
Victoria Martinez de la Cruz
4ca64cd718 Add mgr caps to manila user
Added mgr "allow *" for manila user
Change-Id: I4a0dfbe4925554adbb40fe3d24e44098589f1a09
2020年07月15日 18:07:02 +00:00
Zuul
819f3995af Merge "Use apt-get to update repos on Ubuntu" 2020年07月08日 19:22:54 +00:00
Zuul
1ec4941c19 Merge "Enable volume revert to snapshot RBD tests from Ussuri" 2020年07月07日 15:56:00 +00:00
Lee Yarwood
16f8bef33b Use apt-get to update repos on Ubuntu
The use of apt to refresh repos is discouraged and prints the following
warning when used:
WARNING: apt does not have a stable CLI interface. Use with caution in scripts
The use of apt also appears to break on our Xenial based branches where
we enable the Xenial Queens Ubuntu Cloud Archive repos that are
unsigned. When using apt to refresh these repos apt returns a failure,
while apt-get only returns a warning.
This change simply switches to apt-get to avoid the above warning and to
allow the older Xenial based stable branches to continue to work.
Change-Id: Ic534a47fff17d36eb1ef128ad6af70a34ed942c9
2020年07月07日 15:41:54 +01:00
Victoria Martinez de la Cruz
5bfcd10235 Updates script to use latest version of Ceph
We were using Jewel/Luminous. Being a developer tool, we should
be sticking with newer versions.
This patch set also adds the following changes
- Refactor setup_packages_for_manila_on_<distro> functions
- Removes ceph_init call. Seems it lost relevance
- Removes APT repositories setup. We directly use shaman/chacra
packages directly
- Removes RUN_AS env var. It has been a while since Ceph
defaults to ceph user to run all the services. No longer needed.
- Removes sleep calls for services start checks. We use systemctl
checks.
- Adds more debugging logs
- Uses the search API from ceph shaman instead of hardwiring urls
- Adds the jq (JSON processor) dependency
Change-Id: I51c90e592070b99422e692d5e9e97083d93146e8
2020年06月19日 00:07:57 -03:00
Kevin Zhao
7cb36090f3 support focal
Change-Id: Ieb04d25e0ce0b061e4e2ac26b36e371bd666eedd
Signed-off-by: Kevin Zhao <kevin.zhao@linaro.org>
2020年06月18日 08:03:01 +00:00
Zuul
8d23cc6621 Merge "Enable encrypted volume attachment on non-master branch" 2020年05月21日 22:59:38 +00:00
Luigi Toscano
3987d1d673 Enable encrypted volume attachment on non-master branch
Implement an old TODO item, but in the other way: instead of
enabling the feature on certain branches, disable it on the old
branches (anything still open - even EM - before queens)
and rely on the default value (True) otherwise.
Change-Id: Id5dedf496b355362031deefab1573d052fc72a66
2020年05月21日 01:55:58 +02:00
Luigi Toscano
437ebc54b1 Enable volume revert to snapshot RBD tests from Ussuri
QA people pointed out that It should be set here, not in the job.
Change-Id: Id925fe667472f7a71ac236aec136dd7b59e43794
2020年05月12日 00:20:31 +02:00
Goutham Pacha Ravi
6e70fbcf81 Always enable manila if manila is available
The Manila driver is not WIP, it's used in many
production deployments since the Liberty release.
Set the option ENABLE_CEPH_MANILA to True in case,
so that the manila related setup will occur automatically
if manila is enabled in devstack.
Change-Id: Iec66b201fd775125505fd229963f2d0a5e64c8cb
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
2020年05月07日 10:52:19 -07:00
Victoria Martinez de la Cruz
a97b1449cd Check that ceph-mon service has started to get its version
Add an extra check to verify that ceph-mon service has started
before trying to retrieve its version.
An already existing function is being used, wait_for_daemon
Since we now guarantee that we are using systemctl, we can use
the is-active feature. If the service is running, the exit code
will be 0.
Also, change the command used to get the mon version. We can use
the ceph version command provided by the new cli instead of using
ceph daemon command which requires more privileges.
Change-Id: I2d4f23721107c4b5cb1c09719c55424eecd0c880
Closes-Bug: #1872855 
2020年04月23日 23:07:51 +00:00
Victoria Martinez de la Cruz
e6591702d8 Removes upstart support
Upstart is not being used anymore (last release was Sept 2014)
Doesn't make sense to keep bits for this
Make this plugin compatible only with distros with systemctl
Change-Id: I4fd533985d5bce3e0513c46558763629fb1539fc
Closes-Bug: #1874457 
2020年04月23日 15:34:20 +00:00
Lee Yarwood
299e958635 Enable extend_attached_volume feature
I5698e451861828a8b1240d046d1610d8d37ca5a2 introduced support for this
test in Stein so enable the compute feature from Stein onwards.
Blueprint: extend-in-use-rbd-volumes
Change-Id: I6b2575b12fdb9636f106b3ca28681e29ad3eb8ac
2019年12月06日 14:56:37 +00:00
Stephen Finucane
856dbe5280 Only install python3 packages if necessary
In change I43de36ab570af40bc837d859568f5428c167f083, we started
installing the 'python3-' variants of the 'python-' packages installed
by the 'ceph-common' package in 'install_ceph_remote'. In that change,
we made the assertion that we didn't need to "both hiding this behind
the 'python3_enabled' function or 'USE_PYTHON3' variable since (a) these
packages can happily coexist, (b) projects should be switching to Python
3 now, and (c) using these would require sourcing additional, otherwise
unnecessary devstack libraries just to use this simple function".
However, this didn't take into account the fact that this plugin is not
versioned. This means *any* job that uses this plugin, including things
like stable/pike, will now attempt to install the 'python3-' packages.
Since the base OS on stable/pike, Xenial (16.04), doesn't actually
provide these 'python3-' variants, the command will always fail.
Start hiding the command behind a 'use_python3' function call. Hopefully
by time we drop Python 2 support here we won't have maintained branches
using Xenial. If we do, we'll need to branch or something like that.
Change-Id: I890a1e673fde212218eff4fcf82f7941b3283e5f
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Closes-Bug: #1853280 
2019年11月20日 13:19:23 +00:00
Zuul
ee8cc0e9d4 Merge "Use vercmp" 2019年11月18日 16:10:53 +00:00
Zuul
ee65cca853 Merge "Allow choosing Ceph release on CentOS" 2019年11月18日 15:55:02 +00:00
Stephen Finucane
3a36c1c6d2 Install 'python3-' variants of packages in 'install_ceph_remote'
Previously, this command would simply install the 'ceph-common' package,
which includes a number of Python dependencies. Unfortunately, these
packages are the 'python-' variants [1] and there doesn't appear to be a
'ceph-common-python3' package or similar to install the 'python3-'
variants. As a result, we need to install the 'python3-' variants
manually to ensure consumers of the plugin (like nova) can switch to
Python 3 in their tests.
We don't bother hiding this behind the 'python3_enabled' function or
'USE_PYTHON3' variable since (a) these packages can happily coexist, (b)
projects should be switching to Python 3 now, and (c) using these would
require sourcing additional, otherwise unnecessary devstack libraries
just to use this simple function.
[1] https://packages.ubuntu.com/bionic/ceph-common
Change-Id: I43de36ab570af40bc837d859568f5428c167f083
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
2019年11月14日 15:27:16 +00:00
Tom Barron
1c9e3e772e Manila: clean pools unconditionally
Cleanup of CephFS data and metadata pools for manila was only
being done for external CephFS installs.
Do it whenever manila is enabled.
Change-Id: Iee238f91b04231d1e41774a49615023fe26e56f3
2019年09月22日 20:47:47 +00:00
Lee Yarwood
04871bee0c tempest: re-enable shelve tests for stable queens
Related-Bug: #1653953
Depends-On: https://review.opendev.org/#/c/668123/
Change-Id: I3e1f9683a28a2e2e67a0327031f0670f33391126
2019年08月13日 09:58:36 +00:00
Eric Harney
874e54abeb Use vercmp
Use devstack's vercmp function instead of
bc for version comparisons.
Change-Id: I6436a6f836ad1ab9594858986bfdb8d6d6dbc392
2019年08月09日 10:16:16 -04:00
Eric Harney
1413355064 Allow choosing Ceph release on CentOS
Change-Id: I293ccf2111e2983465fcd8c12b3ea931ad446344
2019年08月06日 09:52:35 -04:00
vkmc
ae9d524b79 Update syntax for cephfs snapshot enablement
We should be using "ceph fs set <fs_name> allow_new_snaps true"
instead of using the mds call
Change-Id: I7a709d49ec4c93b2a06e961ca8ca1414cf4c1918
Closes-Bug: #1838790 
2019年08月02日 13:31:40 -03:00
vkmc
cbdcb8c10a Update call for keys creation
ceph-create-keys was being used to create keys.
This command has been deprecated and it does nothing.
For this reason, keys were not available when starting
daemons and this made the deployment to fail.
This change adds the correct key creation using ceph-authtool.
Change-Id: Ie1a41f67bbf1c7a58e89168b0c8ad63f101648b4
Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
2019年08月02日 13:16:47 -03:00
Lee Yarwood
ffcba4bb55 tempest: re-enable shelve tests for stable rocky
Related-Bug: #1653953
Depends-On: https://review.opendev.org/#/c/668119/
Change-Id: I1aa87fc16a37b6051e55c35ae69ef911a87d4c11
2019年06月28日 10:31:17 +01:00
Lee Yarwood
2590c305f1 tempest: re-enable shelve tests for stable stein
Related-Bug: #1653953
Depends-On: https://review.opendev.org/668118/
Change-Id: I132e26486782918d31a9ac10332f2802342883a9
2019年06月28日 10:27:32 +01:00
Lee Yarwood
fdb1efbe0a tempest: re-enable shelve tests for train
The dependent nova fix resolves the issue with rbd and
shelve/unshelve testing in tempest. Re-enabling the test
needs to be branch-specific since devstack-plugin-ceph
is branch-less but the fixes in nova will be branch
specific so we don't want to enable this on any nova
branch that does not have the fix since it would break
the job on those branches.
Related-Bug: #1653953
Depends-On: https://review.opendev.org/457886/
Co-Authored-By: Matt Riedemann <mriedem.os@gmail.com>
Change-Id: Ifbfc15033020c430a93574f2726b2279c9be130d
2019年06月27日 21:49:12 -04:00
Walter A. Boring IV
ff1b423178 Add ceph-iscsi support
This patch adds support for installing, configuring all required
ceph-iscsi related packages and daemons. ceph-iscsi requires kernel
version 4.16 or greater.
To enable set
ENABLE_CEPH_ISCSI=True
Adds new config options
CEPH_ISCSI_TARGET_IQN - the rbd-target-gw iqn to use to export volumes
CEPH_ISCSI_API_HOST - the rbd-target-api ip to use to listen on
CEPH_ISCSI_API_PORT - the rbd-target-api port
CEPH_ISCSI_API_USER - the rbd-target-api user for auth against the api
CEPH_ISCSI_API_PASSWORD - the rbd-target-api password for auth against the api
The following packages are required and their deps
tcmu-runner - this requires kernel version 4.16 and > to work. Ubuntu
doesn't have a prebuilt package for this, so we pull it down and compile it.
rtslib-fb - has a pypi package
configshell-fb - has a pypi package
targetcli-fb - doesn't have a pypi package.
ceph-iscsi - doesn't have a pypi package.
The reference documentaion to setup ceph-iscsi targets and daemons:
http://docs.ceph.com/docs/master/rbd/iscsi-target-cli-manual-install
Change-Id: Idfac4883b9d31e80124b8f2f1cc60dd9ce18c594
2019年06月27日 11:30:57 -07:00
Goutham Pacha Ravi
5ca1f397ba Enable scenario tests with CEPHFS
Allow running api and scenario tests
together in the manila test jobs.
Change-Id: Ifbf998d7c8a27ad22a39f46547d1548c052614d0
2019年05月16日 14:07:55 -07:00
Zuul
51f8550b02 Merge "Only import libvirt secret when nova is enabled" 2019年04月01日 17:51:17 +00:00
Tom Barron
74a88c0d3b Always use luminous for manila
Bring CentOS in line with ubuntu and use luminous rather than
jewel for all manila builds.
Change-Id: Ib0924e42551d25b68ee22ffb9b52caba302ac19c
2019年02月07日 14:48:47 -05:00
Tom Barron
2badb448e3 Use luminous for xenial and after
Change-Id: I82cc5232870a820c4c8a0526eb44de45cd67a369
2019年01月31日 14:51:08 -05:00
Tom Barron
d7878f2cba Use shaman again for manila
Builds for ubuntu bionic are working now.
We need newer features not yet packaged for ubuntu bionic
for python3 and ceph volume chmod support.
Change-Id: I20fa99c6f6da7d4042b50020ab0e9f34e7ac2de6
2019年01月29日 08:50:20 -05:00
Tom Barron
a8be9e71a6 Support manila with python3
Use python3 compatible tempest test discovery and
install the relevant python3 libraries.
Change-Id: Iabd1952ddaba85316dec5cf60c89122dc3825912
2019年01月28日 11:06:12 -05:00
Tom Barron
c669989cd8 Use official bionic repos for manila
The shaman ceph and ganesha repos for ubuntu bionic are less
stable than those available with the bionic distro itself so
use the latter.
Also refactor the ceph/ganesha repo configuration so that it
is easier to read and maintain, and since bionic does not ship
with knfs installed make the service stop/disable for these
services robust in that case.
Change-Id: If00cc82cfb076c75a11738dcaca372b0cc7a1848
2019年01月03日 06:17:22 -05:00
Zuul
fb26d5d5a5 Merge "Test attach encrypted volume" 2018年12月13日 14:00:56 +00:00
Eric Harney
c6d3b84268 Test attach encrypted volume
Enable encrypted volume testing.
Change-Id: I96739a3592241aff6326662d15f36b39f1772356
2018年12月12日 15:35:20 -05:00
Tom Barron
1105870917 Support Ubuntu Bionic LTS release for manila
Continue to use the upstream shaman repos for manila so
we can test changes prior to their inclusion in the distro.
Also overwrite /etc/ganesha/ganesha.conf rather than
appending to it since the file now ships with configuration
that breaks ganesha with CephFS FSAL.
Change-Id: I6db16684fcf1e4ad573e25f0475b283cd85dc2c7
2018年12月11日 07:26:00 -05:00
Zuul
eea5899815 Merge "Support Ubuntu Bionic LTS release" 2018年12月05日 14:18:39 +00:00
Jens Harbott
39de6df041 Fix installation of PasteDeploy from upstream pkgs (again)
Similar to what happened some time ago for the stable/queens branch, we
are now seeing issues again on master after there was a new Paste
release being made a couple of weeks ago. So we need to perform
the same workaround of forcing pip to install PasteDeploy over
the distro version on the master branch.
Change-Id: I3e98a08e78182bdf5ec09b30e31b98435ec29456
Closes-Bug: 1803143
2018年11月14日 15:23:04 +00:00
Jens Harbott
917f0bef81 Support Ubuntu Bionic LTS release
Ubuntu Bionic has Ceph Luminous packages available natively, so we don't
need to set up any additional repositories.
Add a delay after starting ceph-mon in order to allow it to run
properly.
Change-Id: I2c40c4b4e49145d679affaba678f7117ce73a1d1
2018年10月24日 07:00:12 +00:00
Luigi Toscano
21de8038dd Fix the Keystone authentication URL used by RadosGW
Simply use $KEYSTONE_SERVICE_URI, which is the value also
exported through OS_* variables.
Change-Id: I07296379fa691fed20ed5b1c53b335b2442a6c4e
2018年06月20日 19:17:28 +02:00
Luigi Toscano
20cad2d3b5 Add shared functions to configure ceph repositories
The functions support only repositories from shaman,
but they can be extended to support stable repositories as well.
Change-Id: I633f80c0f74a69e6d67674398f2013f09b96c661
2018年05月30日 22:17:55 +02:00
Luigi Toscano
023be1103f Cleanup CentOS/Fedora support
Clean the "CentOS" branch, so that it should work for all
CentOS/RHEL variants (7.x). Make sure to install the
required repositories also in the non-Manila case.
Fedora already ships Ceph packages so does not need additional
repositories.
Do not try to install ceph-radosgw twice.
Finally, explicitly fail for other distributions (not supported
de-facto even in the current code).
Change-Id: I83b1fffad405bc122bc55ef1173f5239f41d2b36
2018年05月30日 16:16:45 +02:00
Luigi Toscano
5b07d43b3e Use iniset to populate CEPH_CONF_FILE whenever possible
The remaining occurrences of cat <<... EOF populate non-INI files.
Remove few security checks which are not needed, because iniset
takes care of checking the existence of the section and keys and
adding or replacing them if needed.
Change-Id: I4951e1f2f456b3c6f83fd4868db90fae9d811fbe
2018年05月22日 18:25:46 +02:00
Zuul
3660548a32 Merge "rgw/keystone: disable the NSS db integration by default" 2018年05月22日 14:54:11 +00:00
Luigi Toscano
24c8bd8d38 rgw/keystone: disable the NSS db integration by default
The integration with keystone through the PKI tokens (which is removed
anyway since Ocata) and SSL is now disabled by default, and enabled
only if a new variable (CEPH_RGW_KEYSTONE_SSL) is explicitely set
to True.
Change-Id: I4884a8e63c04451e83eb7a104ad7eb7d520b0921
2018年05月21日 18:19:27 +02:00
Luigi Toscano
6d1ef658c9 Remove the usage of KEYSTONE_CATALOG_BACKEND
It was removed from DevStack before the Ocata release, see
https://review.openstack.org/#/c/391380/
The support for the only alternative (templated catalog) was
removed even earlier, before Mitaka:
https://review.openstack.org/#/c/278333/
This means that the entry points for Swift can always be
configured when RadosGW is enabled.
Change-Id: I25c1f963665fab1dc77db40a2742dc29a9c1ee0b
2018年05月21日 10:33:10 +02:00
Luigi Toscano
1731d2364c Fix the variable for identity version, change default
The names were used for the same entity, so the default was never
applied. Use the variable defined first (and whose name looks
more consistent with the variable normally used to defined
the identity name).
Also, change the default version to 3. As no one seems to be
using it right now on the gates, it should not break anything.
Change-Id: I4cbb104198e2cdaa8e3e8c4b1f1c20dc3e0048b5
2018年05月16日 10:16:05 +02:00
Jens Harbott
53b56e147a Apply workaround for PasteDeploy only on stable/queens
The workaround in order to fix the issue with Paste/PasteDeploy being
pulled in as system packages when installing ceph is only needed for the
Pike UCA. Assume that we only use that when devstack is running at the
stable/queens branch.
Change-Id: I0bbf04be015b777b3feb2c5e837b1f46f81cf3e9
2018年04月24日 09:25:29 +00:00
Jon Bernard
c5c0adcc60 Only import libvirt secret when nova is enabled
This fixes a small logical error, we only want to set a libvirt secret
if nova is enabled, not both cinder and nova. This prevents a
deployment with cinder but not nova from being successful.
Change-Id: Ief83fe661cf1b2099af8131a7a206ffca3458dc7
2018年03月20日 12:40:58 -04:00