openstack/devstack
Code Issues Proposed changes

Remove manual setting of privsep helper

Browse Source 
The privsep helper should have a sane default for all libraries,
pushing this into devstack means we cheat past a part of the upgrade
that we really shouldn't be.

Change-Id: I52259e2023e277e8fd62be5df4fd7f799e9b36d7
This commit is contained in:
Sean Dague
2016-08-01 10:29:03 -04:00
parent d715852753
commit e56318f9bc
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cinder
View File

@@ -273,8 +273,6 @@ function configure_cinder {
iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME" iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME"
iniset $CINDER_CONF privsep_osbrick helper_command "sudo cinder-rootwrap \$rootwrap_config privsep-helper --config-file $CINDER_CONF"
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then
local enabled_backends="" local enabled_backends=""
local default_name="" local default_name=""

5
lib/nova
View File

@@ -481,11 +481,6 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT bindir "/usr/bin" iniset $NOVA_CONF DEFAULT bindir "/usr/bin"
fi fi
iniset $NOVA_CONF privsep_osbrick helper_command "sudo nova-rootwrap \$rootwrap_config privsep-helper --config-file $NOVA_CONF"
iniset $NOVA_CONF vif_plug_ovs_privileged helper_command "sudo nova-rootwrap \$rootwrap_config privsep-helper --config-file $NOVA_CONF"
iniset $NOVA_CONF vif_plug_linux_bridge_privileged helper_command "sudo nova-rootwrap \$rootwrap_config privsep-helper --config-file $NOVA_CONF"
if is_service_enabled n-api; then if is_service_enabled n-api; then
if is_service_enabled n-api-meta; then if is_service_enabled n-api-meta; then
# If running n-api-meta as a separate service # If running n-api-meta as a separate service