Merge "Initialise oslo.privsep early in main"

cinder/cmd/backup.py

@@ -18,11 +18,13 @@
 """Starter script for Cinder Volume Backup."""
 
 import logging as python_logging
+import shlex
 import sys
 
 import eventlet
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_privsep import priv_context
 from oslo_reports import guru_meditation_report as gmr
 from oslo_reports import opts as gmr_opts
 
@@ -49,6 +51,7 @@ def main():
          version=version.version_string())
     logging.setup(CONF, "cinder")
     python_logging.captureWarnings(True)
+    priv_context.init(root_helper=shlex.split(utils.get_root_helper()))
     utils.monkey_patch()
     gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
     server = service.Service.create(binary='cinder-backup')

cinder/cmd/volume.py

@@ -31,10 +31,12 @@ if os.name == 'nt':
 else:
     eventlet.monkey_patch()
 
+import shlex
 import sys
 
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_privsep import priv_context
 from oslo_reports import guru_meditation_report as gmr
 from oslo_reports import opts as gmr_opts
 
@@ -74,6 +76,7 @@ def main():
          version=version.version_string())
     logging.setup(CONF, "cinder")
     python_logging.captureWarnings(True)
+    priv_context.init(root_helper=shlex.split(utils.get_root_helper()))
     utils.monkey_patch()
     gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
     launcher = service.get_launcher()

requirements.txt

@@ -22,6 +22,7 @@ oslo.log>=1.14.0 # Apache-2.0
 oslo.messaging>=5.2.0 # Apache-2.0
 oslo.middleware>=3.0.0 # Apache-2.0
 oslo.policy>=1.9.0 # Apache-2.0
+oslo.privsep>=1.9.0 # Apache-2.0
 oslo.reports>=0.6.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0