From 86f6e8d8a5f05e1bff5e6b9c4f1629101efd3193 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 4 Nov 2016 11:05:44 +0000 Subject: [PATCH] Update paste, policy and rootwrap configurations 2016-11-04 Change-Id: I142e95ddf95a834c5fbbdfc3ea54cedf62da8909 --- files/rootwrap.d/ironic-images.filters | 2 +- files/rootwrap.d/ironic-lib.filters | 2 +- files/rootwrap.d/ironic-utils.filters | 2 +- templates/rootwrap.conf.j2 | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/files/rootwrap.d/ironic-images.filters b/files/rootwrap.d/ironic-images.filters index 8c2aa7b5..0dfbb526 100644 --- a/files/rootwrap.d/ironic-images.filters +++ b/files/rootwrap.d/ironic-images.filters @@ -1,5 +1,5 @@ # ironic-rootwrap command filters to manipulate images -# This file should be owned by (and only-writeable by) the root user +# This file should be owned by (and only-writable by) the root user [Filters] # ironic/common/images.py: 'qemu-img' diff --git a/files/rootwrap.d/ironic-lib.filters b/files/rootwrap.d/ironic-lib.filters index 6f38deee..c06530c5 100644 --- a/files/rootwrap.d/ironic-lib.filters +++ b/files/rootwrap.d/ironic-lib.filters @@ -1,6 +1,6 @@ # An ironic-lib.filters to be used with rootwrap command. # The following commands should be used in filters for disk manipulation. -# This file should be owned by (and only-writeable by) the root user. +# This file should be owned by (and only-writable by) the root user. # NOTE: this file is a copy of ironic-lib.filters from the ironic-lib # repository that should ultimately be remove. At this point, we still diff --git a/files/rootwrap.d/ironic-utils.filters b/files/rootwrap.d/ironic-utils.filters index 46e82e5e..ad7de6f0 100644 --- a/files/rootwrap.d/ironic-utils.filters +++ b/files/rootwrap.d/ironic-utils.filters @@ -1,5 +1,5 @@ # ironic-rootwrap command filters for disk manipulation -# This file should be owned by (and only-writeable by) the root user +# This file should be owned by (and only-writable by) the root user [Filters] # ironic/drivers/modules/deploy_utils.py diff --git a/templates/rootwrap.conf.j2 b/templates/rootwrap.conf.j2 index 061c4cd8..3551e841 100644 --- a/templates/rootwrap.conf.j2 +++ b/templates/rootwrap.conf.j2 @@ -1,15 +1,15 @@ # Configuration for ironic-rootwrap -# This file should be owned by (and only-writeable by) the root user +# This file should be owned by (and only writable by) the root user [DEFAULT] # List of directories to load filter definitions from (separated by ','). -# These directories MUST all be only writeable by root ! +# These directories MUST all be only writable by root ! filters_path=/etc/ironic/rootwrap.d,/usr/share/ironic/rootwrap # List of directories to search executables in, in case filters do not -# explicitely specify a full path (separated by ',') +# explicitly specify a full path (separated by ',') # If not specified, defaults to system PATH environment variable. -# These directories MUST all be only writeable by root ! +# These directories MUST all be only writable by root ! exec_dirs={{ ironic_bin }},/sbin,/usr/sbin,/bin,/usr/bin # Enable logging to syslog