From: Sean McGinnis Date: Sat, 5 Sep 2015 18:04:05 +0000 (-0500) Subject: Add os-brick's scsi_id command to Cinder rootwrap X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6996b5b449377aa1d653e66759f7761e2de802ba;p=openstack-build%2Fcinder-build.git Add os-brick's scsi_id command to Cinder rootwrap FC drivers are failing on calls to scsi_id. This command is in the os-brick rootwrap filters, but that file is not being pulled in to Cinder yet. As a temporary fix until that work can be completed, this patch adds the missing command directly to volume.filters to allow this command to run. Follow up work will be needed to remove this and other legacy brick commands from the volume.filters file and instead pull in os-brick's os-brick.filters values. Change-Id: Iba8e5c82f8d203759cda0e21de5fdf2404b18e69 Partial-bug: #1479842 --- diff --git a/etc/cinder/rootwrap.d/volume.filters b/etc/cinder/rootwrap.d/volume.filters index 552cabc97..6737e283c 100644 --- a/etc/cinder/rootwrap.d/volume.filters +++ b/etc/cinder/rootwrap.d/volume.filters @@ -22,6 +22,12 @@ vgs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, vgs lvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvs lvdisplay_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvdisplay +# os-brick library commands +# TODO(smcginnis) This is a temporary fix. Need to pull in os-brick +# os-brick.filters file instead and clean out stale brick values from +# this file. +scsi_id: CommandFilter, /lib/udev/scsi_id, root + # cinder/volumes/drivers/srb.py: 'pvresize', '--setphysicalvolumesize', sizestr, pvname pvresize: CommandFilter, pvresize, root