From bedc8b6622bc711acc86e7ef245be478c1e4a2b4 Mon Sep 17 00:00:00 2001 From: RongzeZhu Date: Mon, 3 Sep 2012 12:26:35 +0800 Subject: [PATCH] Typo fix: nova => cinder Change-Id: I816473b3aa7de16bd2d8569c695c6ced9e1d9033 --- cinder/volume/xiv.py | 2 +- etc/cinder/rootwrap.d/volume.filters | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cinder/volume/xiv.py b/cinder/volume/xiv.py index e440392a9..6cbad0c18 100644 --- a/cinder/volume/xiv.py +++ b/cinder/volume/xiv.py @@ -40,7 +40,7 @@ ibm_xiv_opts = [ FLAGS = flags.FLAGS FLAGS.register_opts(ibm_xiv_opts) -LOG = logging.getLogger('nova.volume.xiv') +LOG = logging.getLogger('cinder.volume.xiv') class XIVDriver(san.SanISCSIDriver): diff --git a/etc/cinder/rootwrap.d/volume.filters b/etc/cinder/rootwrap.d/volume.filters index 23fddbca8..24cc56202 100644 --- a/etc/cinder/rootwrap.d/volume.filters +++ b/etc/cinder/rootwrap.d/volume.filters @@ -1,32 +1,32 @@ -# nova-rootwrap command filters for volume nodes +# cinder-rootwrap command filters for volume nodes # This file should be owned by (and only-writeable by) the root user [Filters] -# nova/volume/iscsi.py: iscsi_helper '--op' ... +# cinder/volume/iscsi.py: iscsi_helper '--op' ... ietadm: CommandFilter, /usr/sbin/ietadm, root tgtadm: CommandFilter, /usr/sbin/tgtadm, root tgt-admin: CommandFilter, /usr/sbin/tgt-admin, root -# nova/volume/driver.py: 'vgs', '--noheadings', '-o', 'name' +# cinder/volume/driver.py: 'vgs', '--noheadings', '-o', 'name' vgs: CommandFilter, /sbin/vgs, root -# nova/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,.. -# nova/volume/driver.py: 'lvcreate', '-L', ... +# cinder/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,.. +# cinder/volume/driver.py: 'lvcreate', '-L', ... lvcreate: CommandFilter, /sbin/lvcreate, root -# nova/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,... +# cinder/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,... dd: CommandFilter, /bin/dd, root -# nova/volume/driver.py: 'lvremove', '-f', %s/%s % ... +# cinder/volume/driver.py: 'lvremove', '-f', %s/%s % ... lvremove: CommandFilter, /sbin/lvremove, root -# nova/volume/driver.py: 'lvdisplay', '--noheading', '-C', '-o', 'Attr',.. +# cinder/volume/driver.py: 'lvdisplay', '--noheading', '-C', '-o', 'Attr',.. lvdisplay: CommandFilter, /sbin/lvdisplay, root -# nova/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',... -# nova/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ... +# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',... +# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ... iscsiadm: CommandFilter, /sbin/iscsiadm, root iscsiadm_usr: CommandFilter, /usr/bin/iscsiadm, root -#nova/volume/.py: utils.temporary_chown(path, 0), ... +#cinder/volume/.py: utils.temporary_chown(path, 0), ... chown: CommandFilter, /bin/chown, root -- 2.45.2