diff options
| author | Ghe Rivero <ghe@debian.org> | 2013-06-03 17:41:49 +0200 |
|---|---|---|
| committer | Ghe Rivero <ghe@debian.org> | 2013-06-05 19:54:10 +0200 |
| commit | 81174e108abe5dbdcc2577b9146f43cd6d526dff (patch) | |
| tree | da71f6467fee728722090e1d94898e18030cef59 | |
| parent | 89ea41ef51c1a4df5a1b5a7072e1bf78cd886fdd (diff) | |
| download | ironic-81174e108abe5dbdcc2577b9146f43cd6d526dff.tar.gz | |
Fix ironic-rootwrap capability.
- Added ironic-rootwrap to setup.cfg/entry_points
- Use ironic-rootwrap as root-helper for execute()
Change-Id: I93f9f5fa60e456ce86f878e2a35c849d0ceeca14
| -rw-r--r-- | ironic/common/utils.py | 4 | ||||
| -rw-r--r-- | setup.cfg | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ironic/common/utils.py b/ironic/common/utils.py index 1c53e154b..a7c49c320 100644 --- a/ironic/common/utils.py +++ b/ironic/common/utils.py @@ -76,7 +76,7 @@ def execute(*cmd, **kwargs): """Helper method to execute command with optional retry. If you add a run_as_root=True command, don't forget to add the - corresponding filter to etc/nova/rootwrap.d ! + corresponding filter to etc/ironic/rootwrap.d ! :param cmd: Passed to subprocess.Popen. :param process_input: Send to opened process. @@ -115,7 +115,7 @@ def execute(*cmd, **kwargs): 'to utils.execute: %r') % kwargs) if run_as_root and os.geteuid() != 0: - cmd = ['sudo', 'nova-rootwrap', CONF.rootwrap_config] + list(cmd) + cmd = ['sudo', 'ironic-rootwrap', CONF.rootwrap_config] + list(cmd) cmd = map(str, cmd) @@ -31,6 +31,7 @@ console_scripts = ironic-api = ironic.cmd.api:main ironic-dbsync = ironic.cmd.dbsync:main ironic-manager = ironic.cmd.manager:main + ironic-rootwrap = ironic.openstack.common.rootwrap.cmd:main ironic.controllers = fake = ironic.drivers.fake:FakeControlDriver |