Revert "ensure ceph user/group"

The original commit was aimed to fix an issue with ceph deployment.

In jewel release radosgw service is executed as 'ceph' user, and in
'hammer' it was 'root' user. Puppet manifests configure all files in
/etc/ceph for 'root' user access only. Now (in jewel) radosgw keyring
file needed to be chowned to allow ceph user read it's content.
Without that ceph installation in Xenial is broken.

This was done in I0ad62b36293e70b5799f3c2dc39b4b2babd08813 and worked
well until tests agains 'hammer' release were run. In 'hammer' there is
no 'ceph' user / group, so changing permissions failed.

We tryied (incorrectly) to fix this by adding user / group in puppet,
and run into race condition between puppet and ceph package when they
both were trying to add / modify user.

So we decided to revert this change and only set correct permissions
to keyring file assuming that user / group 'ceph' already exist.

This reverts commit 822a55230c.

Change-Id: I31cd68336a0a264a8a055aa0f8b637a613b8e2d5
This commit is contained in:
Dmitry Teselkin 2016-08-03 16:52:42 +00:00
parent 769ca1ded6
commit f04554ea6a
1 changed files with 0 additions and 18 deletions

View File

@ -40,23 +40,6 @@ class osnailyfacter::ceph::radosgw {
fail('Please provide radosgw_key')
}
group { 'ceph':
ensure => "present",
system => true,
gid => 64045,
provider => "groupadd",
}
user { 'ceph':
ensure => "present",
system => true,
gid => 'ceph',
uid => 64045,
home => "/",
shell => "/bin/false",
require => Group['ceph'],
}
ceph::key { "client.${gateway_name}":
keyring_path => "/etc/ceph/client.${gateway_name}",
user => 'ceph',
@ -65,7 +48,6 @@ class osnailyfacter::ceph::radosgw {
cap_mon => 'allow rw',
cap_osd => 'allow rwx',
inject => true,
require => User['ceph'],
}
class { 'ceph':