Browse code
Remove manual setting of privsep helper
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
Sean Dague authored on 2016/08/01 23:29:03Showing 2 changed files
| ... | ... |
@@ -273,8 +273,6 @@ function configure_cinder {
|
| 273 | 273 |
|
| 274 | 274 |
iniset $CINDER_CONF DEFAULT os_region_name "$REGION_NAME" |
| 275 | 275 |
|
| 276 |
- iniset $CINDER_CONF privsep_osbrick helper_command "sudo cinder-rootwrap \$rootwrap_config privsep-helper --config-file $CINDER_CONF" |
|
| 277 |
- |
|
| 278 | 276 |
if is_service_enabled c-vol && [[ -n "$CINDER_ENABLED_BACKENDS" ]]; then |
| 279 | 277 |
local enabled_backends="" |
| 280 | 278 |
local default_name="" |
| ... | ... |
@@ -481,11 +481,6 @@ function create_nova_conf {
|
| 481 | 481 |
iniset $NOVA_CONF DEFAULT bindir "/usr/bin" |
| 482 | 482 |
fi |
| 483 | 483 |
|
| 484 |
- iniset $NOVA_CONF privsep_osbrick helper_command "sudo nova-rootwrap \$rootwrap_config privsep-helper --config-file $NOVA_CONF" |
|
| 485 |
- |
|
| 486 |
- iniset $NOVA_CONF vif_plug_ovs_privileged helper_command "sudo nova-rootwrap \$rootwrap_config privsep-helper --config-file $NOVA_CONF" |
|
| 487 |
- iniset $NOVA_CONF vif_plug_linux_bridge_privileged helper_command "sudo nova-rootwrap \$rootwrap_config privsep-helper --config-file $NOVA_CONF" |
|
| 488 |
- |
|
| 489 | 484 |
if is_service_enabled n-api; then |
| 490 | 485 |
if is_service_enabled n-api-meta; then |
| 491 | 486 |
# If running n-api-meta as a separate service |