diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-06-25 18:04:11 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-06-25 18:04:11 +0800 |
| commit | 5e90e90b110ec2fbbf1f67234565e525139affe7 (patch) | |
| tree | 842cbce3e3a89bfeb5ece4ed952e871231d6970c /ansible | |
| parent | 330d925ce4d01a0f793a68d5981862d68a8bd03a (diff) | |
| download | kolla-5e90e90b110ec2fbbf1f67234565e525139affe7.tar.gz kolla-5e90e90b110ec2fbbf1f67234565e525139affe7.zip | |
Set the privsep_osbrick.helper_command in nova and cinder
os-brick starts using privsep, it will need to know how to invoke its
privileged half. This follow the how the devstack fixed in nova[1] and
cinder[2].
[1] https://review.openstack.org/#/c/277696/
[2] https://review.openstack.org/#/c/280031/
TrivialFix
Change-Id: I3761a5bde9766297127ad2011453ae4221ff5c2b
Diffstat (limited to 'ansible')
| -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 d1ff2b33b..31ed79655 100644 --- a/ansible/roles/cinder/templates/cinder.conf.j2 +++ b/ansible/roles/cinder/templates/cinder.conf.j2 @@ -92,3 +92,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 475416096..b1777b69b 100644 --- a/ansible/roles/nova/templates/nova.conf.j2 +++ b/ansible/roles/nova/templates/nova.conf.j2 @@ -175,3 +175,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 |