diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-18 08:46:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-18 08:46:18 +0000 |
| commit | 7a82901ada9079a17837520bccb2c6073e0c0a7a (patch) | |
| tree | 7f78fe479999bba63532ca73501708e5c9fabf7b | |
| parent | 72d13a3e2a21cadbbaafac98c59b136f2c72b6d4 (diff) | |
| parent | 5e90e90b110ec2fbbf1f67234565e525139affe7 (diff) | |
| download | kolla-7a82901ada9079a17837520bccb2c6073e0c0a7a.tar.gz kolla-7a82901ada9079a17837520bccb2c6073e0c0a7a.zip | |
Merge "Set the privsep_osbrick.helper_command in nova and cinder"
| -rw-r--r-- | ansible/roles/cinder/templates/cinder.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/nova/templates/nova.conf.j2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ansible/roles/cinder/templates/cinder.conf.j2 b/ansible/roles/cinder/templates/cinder.conf.j2 index a20182497..86f7375a3 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -97,3 +97,6 @@ rbd_user = cinder rbd_secret_uuid = {{ rbd_secret_uuid }} report_discard_supported = True {% endif %} + +[privsep_entrypoint] +helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --config-file /etc/cinder/cinder.conf diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2 index b9e1b061a..8a6ea6309 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -174,3 +174,6 @@ topics = notifications {% else %} driver = noop {% endif %} + +[privsep_entrypoint] +helper_command=sudo nova-rootwrap /etc/nova/rootwrap.conf privsep-helper --config-file /etc/nova/nova.conf |