Fix ironic-rootwrap capability.

- Added ironic-rootwrap to setup.cfg/entry_points
- Use ironic-rootwrap as root-helper for execute()

Change-Id: I93f9f5fa60e456ce86f878e2a35c849d0ceeca14

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)
 

setup.cfg

@@ -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