Revert "Remove /var/lib/ceph from updatedb"

ceph and swift-storage apps may end up on the same unit
so a different approach is needed.

This reverts commit 7b38a56cf5.

Change-Id: Id74e014d856718fbc5e4d714578b233145c9c047
This commit is contained in:
James Page 2017-01-23 08:38:40 +00:00
parent 7b38a56cf5
commit d332db2d52
2 changed files with 0 additions and 11 deletions

View File

@ -1,6 +0,0 @@
# This file is owned by the Ceph charm and could be replaced at any time
PRUNE_BIND_MOUNTS="yes"
# PRUNENAMES=".git .bzr .hg .svn"
PRUNEPATHS="/tmp /var/spool /media /home/.ecryptfs /var/lib/schroot /var/lib/ceph"
PRUNEFS="NFS nfs nfs4 rpc_pipefs afs binfmt_misc proc smbfs autofs iso9660 ncpfs coda devpts ftpfs devfs mfs shfs sysfs cifs lustre tmpfs usbfs udf fuse.glusterfs fuse.sshfs curlftpfs ecryptfs fusesmb devtmpfs"

View File

@ -44,7 +44,6 @@ from charmhelpers.core.host import (
umount,
mkdir,
cmp_pkgrevno,
rsync,
service_reload,
service_restart)
from charmhelpers.fetch import (
@ -328,10 +327,6 @@ def config_changed():
umount(e_mountpoint)
prepare_disks_and_activate()
install_apparmor_profile()
script = os.path.join('/etc', 'updatedb.conf')
rsync(os.path.join(os.getenv('CHARM_DIR'), 'files',
'updatedb.conf'),
script)
@hooks.hook('storage.real')