19051aa4cd779d9f6265a1a0a9fd00617ac72dab
Commit Graph

34 Commits

Author SHA1 Message Date
Tom Barron
19051aa4cd Support systemd and ceph versions >= 9.2
Currently the devstack ceph plugin uses installation,
configuration, startup, and shutdown commands that do not always
work correctly for Ceph releases after hammer or with systemd
init system.
Check the ceph version and the init system and use appropriate
commands.
Co-Authored-By: Ramana Raja <rraja@redhat.com>
Change-Id: I25d8816740c6008b076986f3677c299ad9843c30
2016年07月01日 14:23:24 -04:00
Tom Barron
28ae5aeae3 Enable multiple ceph filesystems for manila
In a lab setting it can be useful to allow multiple manila devstacks,
each with its own CephFS filesystem, to share a common REMOTE_CEPH
cluster.
Parameterize the name of the CephFS filesystem that devstack creates
and enable creation of multiple filesystems if appropriate variables
are set in local.conf.
Note that since separate filesystems require separate data and metadata
pools, one also needs to set values for the extant CEPHFS_DATA_POOL and
CEPHFS_METADATA_POOL parameters.
Change-Id: I67a88b75d06f04621cb0dac726f307a06ee6113b
2016年06月20日 09:46:44 -04:00
Tom Barron
7540a7946a Fix settings for CephFS data and metadata pools
Although the devstack ceph plugin uses variables - CEPHFS_DATA_POOL and
CEPHFS_METADATA_POOL - as arguments to the 'osd pool create' commands
that provision the pools required for manila to use the CephFS Native
backend, the overrides to the default values for these variables sets
both of them to $CEPHFS_CEPH_POOL. This setting is counter-intuitive,
and worse, forces use of a single pool for both data and metadata in the
case both default values are overridden.
Use CEPHFS_DATA_POOL and CEPHFS_METADATA_POOL as the override
variables for the data pool and metadata pool, respectively.
Change-Id: Iae2859388ce5e74b6f532cf2cf7809aaa09746cb
Closes-Bug: 1593829
2016年06月17日 14:19:50 -04:00
Jenkins
4818f581fe Merge "Use ${CEPH_DATA_DIR} everywhere" 2016年06月10日 10:12:46 +00:00
Jenkins
e21954821a Merge "Fix restack problem with libvirt secret" 2016年06月10日 10:12:44 +00:00
Jenkins
92d33fb9fe Merge "Update the supported Fedora releases" 2016年06月10日 10:12:16 +00:00
Tom Barron
5943d57eb4 Use ${CEPH_DATA_DIR} everywhere
The CEPH_DATA_DIR variable holds the location of Ceph drives and
objects. It defaults to '/var/lib/ceph'.
Replace hardcoded occurrences of '/var/lib/ceph' with
'${CEPH_DATA_DIR}'.
Change-Id: I2570e37f9135d853854600acfbfff3b768e4f0e3
2016年05月28日 06:15:32 -04:00
Tom Barron
85f49431a9 Fix restack problem with libvirt secret
Restacking with ceph plugin fails when trying to install
the cinder user's ceph authorization key in libvirt's list
of secrets because there is already a secret in that list
with the same uuid. The function _undefine_virsh_secret
is run on cleanup and should have removed that key from
the libvirt secret list.
Fix a typo in the variable name for the uuid that identifies
the authorization key in the secret list so that the
cleanup routine removes the key as intended.
Closes-Bug: #1570665
Change-Id: I19d2c20979dca49d73c427c5b1413229ff39f394
2016年05月28日 05:23:10 -04:00
Jon Bernard
f546b4ac9a Fix typo in ruleset parsing
The rule_id line is formatted as:
 "rule_id": 0,
Which means the id integer is the second column of the parsed output,
not the third.
Since a third column doesn't exist, the call to cut returns nothing,
leaving $RULE_ID invalid, which then causes the subsequent ruleset
commands to fail.
We don't see this normally because $CEPH_REPLICAS is set to 1 by
default.
Change-Id: I0cc57f5abc023cb8b2faeea940f28ab54cd290ff
Related-Bug: #1581159 
2016年05月12日 14:00:34 -04:00
Lee Yarwood
3ed9275cec Update the supported Fedora releases
Hammer LTS 0.94.6 is currently available for Fedora 22 and 23 [1].
Fedora 21 is EOL and should be removed from the list [2].
[1] https://admin.fedoraproject.org/pkgdb/package/rpms/ceph/
[2] https://fedoraproject.org/wiki/Releases
Change-Id: I5fc7f25ed145c29cadbe03d945511aaa12c54310
2016年05月12日 10:18:42 +01:00
melanie witt
fe06350c48 Add release key for installing packages from ceph.com
In commit bb773e7285 the key for
verifying release packages from ceph.com was removed when support for
the ceph package mirrors was added. However, it is still needed for
non-gate case of fetching packages from ceph.com, so this adds it
back in that case.
Closes-Bug: #1578494
Change-Id: I18f8927f42710e9365c246c55f26f53403965ee1
2016年05月05日 05:39:52 +00:00
Jon Bernard
bb773e7285 Use ceph.com packages if not already configured
For the ceph job to be voting, infra requires that we pull packages from
a pre-configured repository that's mirrored and reliable for gate jobs.
They have arranged for ceph.com packages to be mirrored and will store a
link to those packages in /etc/apt/sources.list.d/ceph.list. If this
file is present, we should use it. If not, then we're free to update
the sources list to fetch the latest packages.
This approach is required to regain voting status in the gate.
Change-Id: I5f811c917e6964c33440ed644597c9e485963626
2016年04月18日 17:17:39 -04:00
Ramana Raja
e5f8480179 Install Jewel packages of Ceph for manila
The changes in Ceph that were needed to make manila's cephfs_native
driver work are available in the Jewel branch. It's no longer
necessary to use the 'wip-manila' branch.
Also, with Jewel branch, manila's libcephfs client needs to be root
to perform certain manila operations. So set manila's client as root.
Change-Id: I715f79a6801b12522c047b1df4d950c99a1ffad5
2016年04月07日 18:29:29 +05:30
Mehdi Abaakouk
b53a074536 ceph: Allow to change the image path
If we want to put the disk image into a tmpfs, changing CEPH_DATA_DIR
won't work because some file operation needed by ceph are not allowed
on tmpfs.
So, this change allows to change the disk image path only instead of the
whole CEPH_DATA_DIR.
Change-Id: If92f0bdca16f866a475820cf71a30ded28fb2572
2016年03月30日 10:08:47 +02:00
Sébastien Han
65ab7713f7 Always use -p with mkdir
So if the directory exists the stack does not fail.
Change-Id: Ibdd2883b5328d58d7c2a74d97dfe2e0ea87d65ee
Signed-off-by: Sébastien Han <seb@redhat.com>
2016年03月17日 10:30:25 -04:00
Jon Bernard
18ee55a0a7 Fix formatting and indentation
Since we're about to be voting and I expect a few more people to be
interested in the code, I think now is the best time to fix the
indenting. It's a large patch, but there should be no functional
changes.
I removed one unused function and renamed internal-only function to be
prefixed with '_'.
Change-Id: Ibb9b26f0cc8719be4fec121c1b9aa279938aebd7
2016年03月13日 15:35:14 -04:00
Jenkins
18524a2d39 Merge "Enable showing multiple locations for ceph plugin" 2016年03月13日 12:54:15 +00:00
John Spray
7b344bf77a Manila CI: update cephfs driver name
This was renamed from drivers.cephfs to
drivers.cephfs.cephfs_native at the
request of the Manila maintainers.
Change-Id: I7ac2299ad323229418761bb06ee7891a48d87877
2016年02月24日 22:44:00 +05:30
Mike Fedosin
62ea04c8d1 Enable showing multiple locations for ceph plugin
Currently glance v2 doesn't allow to specify custom
locations for image by default, it returns 403.
To enable this 'show_multiple_locations' param must
be set to True.
When Nova is doing snapshots with Ceph it provides
location to activate image, which fails when we use
Glance v2.
To fix it we change the default param to True.
'show_image_direct_url' will be overridden.
Related to blueprint use-glance-v2-api
Change-Id: Id0f1c398b8b48f2ffc2488b29bc7cbd279069337
2016年02月12日 16:36:12 +00:00
Deepak C Shetty
2a41327da0 Use ceph.conf to set default pool replica size
Use ceph.conf to set the default pool replica size, thus
avoiding the need to set replica size for each pool
separately.
Change-Id: Ib00c1666895af2332a3689ee59b9929af81a17e9
2016年01月26日 19:23:30 +05:30
Jenkins
8c9024fcf0 Merge "Clean up ceph-mds in cleanup_ceph_embedded" 2016年01月22日 18:52:39 +00:00
Jenkins
41d1f86fee Merge "Fix package list for installing with Manila" 2016年01月22日 05:18:06 +00:00
Jenkins
d77c21002e Merge "Stop daemons before cleanup in unstack" 2016年01月22日 05:14:48 +00:00
John Spray
2834b29880 Fix package list for installing with Manila
Change-Id: Ibdbf1feaf6a3452705b29a1865e319afba4d562e
2016年01月21日 15:14:08 +00:00
Ramana Raja
1c46b28dde Set protocol for Manila with cephfs native driver
When Manila is enabled with cephfs native driver, the plugin fails to
enable protocol 'cephfs' in Manila's configuration file. Correct
this failure.
Change-Id: I145c5628f781a807231bcf1a77d5e3010a7185ca
Closes-Bug: #1536625 
2016年01月21日 19:09:35 +05:30
John Spray
190c515a34 Clean up ceph-mds in cleanup_ceph_embedded
Change-Id: Ib62022f8d50901378b853dfd20d8d8341b3db10d
2016年01月20日 16:47:08 +00:00
Sébastien Han
592c7d5711 Add radosgw (aka rgw) support
This patch enables the plugin to setup ceph radosgw and configures
it as a swift-compatible endpoint with keystone integration.
ENABLE_CEPH_RGW is the new variable introduced, which is False
by default, and can be set to True in localrc if radosgw needs
to be setup.
Fixed couple of other (related) things ...
1) Created rgw specific functions
2) Checking for radosgw & swift co-existence, erroring out early enough
NOTE: Tested on ubuntu trusty only
TODOs ...
1) Not tested on Fedora (F22), radosgw startup has some issues there.
Co-Authored-By: Deepak C Shetty <deepakcs@redhat.com>
Change-Id: I21db4168eb69d107599f6b6ab1668b02b764b2c6
2016年01月20日 12:47:57 +00:00
John Spray
3d65ac342f Stop daemons before cleanup in unstack
The cleanup_ceph_embedded function nukes the ceph
conf directories, so when subsequently trying
to stop services they aren't stopped. Next stack.sh
run will fail because daemons are still running.
Fix by stopping daemons before running cleanup.
Change-Id: I51cd58eae83171a47aa898b65240b72ea0217af9
Closes-Bug: #1534600 
2016年01月15日 14:21:35 +00:00
Ramana Raja
a25112cd49 Explicitly install ceph-mds package
When Manila is to be configured with CephFS backend, explicitly
install `ceph-mds` package. The newer versions of Ceph packages,
do not have the dependency between `ceph` and `ceph-mds` packages.
Change-Id: Idfd4cf7fc017ad6ced2d325356ff97cc68889dc0
Closes-Bug: #1533314 
2016年01月13日 10:47:25 +05:30
Ramana Raja
530f20c38d Add Manila support for Ubuntu
Let the plugin setup and configure CephFS as the storage backend for
Manila. This is not done by default. Refer the README to do so.
Add 'pre_test_hook' and 'post_test_hook' scripts that would be needed
to configure Manila-Ceph CI jobs.
The following changes are also made:
* Install a development version of Ceph that is compatible with Manila's
 CephFSNative driver.
* The development version is a version greater than Infernalis. And
 from Infernalis onwards, the ceph daemons are run as user "ceph".
 So allow the daemons to run as user "ceph" for such versions.
* Enhance get_ceph_version to check Ceph version even when the
 ceph mon daemon is not up, by checking the CLI version.
Co-Authored-By: John Spray <john.spray@redhat.com>
Change-Id: I74314bfcc6b52d524bb84f2232a988f275b9afbf
2016年01月06日 15:16:57 +05:30
Ramana Raja
dacdc8df02 Allow storage backend to be configurable
Add configurables so that one need not have Ceph be the storage
backend for Cinder, Cinder-backup, Glance and Nova.
Let Ceph be the default storage backend for Cinder, Cinder backup,
Glance, and Nova. Allow the default setting to be overriden when the
global config, ENABLE_CEPH_{CINDER,C_BAK,GLANCE,NOVA} is set to
False in the local.conf/localrc file.
Closes Bug: #1521278
Change-Id: I3afe7c57d5d56f15fe533ad5b1dbe36ccd369e6b
2015年12月16日 18:17:56 +05:30
Deepak C Shetty
6c8db15670 Remove disable_service ceph hack
Now that DEVSTACK_GATE_CEPH is removed from the plugin job's
template definition [1], we no longer need this hack
[1]: https://review.openstack.org/251197
Change-Id: I92810ecc53af37b5c04db318bedf0fef571821e5
2015年12月02日 14:29:17 +05:30
Deepak C Shetty
6909565540 lib/ceph: Fix fedora broken link
Removes the broken fedora 20 url and ensures that ceph and
radosgw packages are installed from the distro repos. See
the associated LP bug 1521073 for more details.
Change-Id: Id11c51bd5451f5c7886696b519ad43f012e83d74
Closes-bug: 1521073
2015年12月01日 15:21:07 +05:30
Sébastien Han
27d28f3101 Initial commit
Co-Authored-By: Deepak C Shetty <deepakcs@redhat.com>
Change-Id: I124b54b5068fbcd46e278281da12ea27f0034d1f
2015年11月27日 19:43:03 +00:00