x/bareon
Code Issues Proposed changes

Use bareon-* namespace for command line entry points

Browse Source 
Change-Id: I3aa9bcf81a961f2eac5068ab243001f0b03738f6
Closes-bug: #1526346
This commit is contained in:
Evgeniy L 2015-12-15 17:58:54 +03:00
parent 99528c2de7
commit 18893f0d08
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ironic/ironic-fa-deploy/ironic_fa_deploy/modules/fuel_agent.py
View File

@ -72,8 +72,8 @@ OTHER_PROPERTIES = {
'fuel_key_filename': _('Name of SSH private key file; default is ' 'fuel_key_filename': _('Name of SSH private key file; default is '
'"/etc/ironic/fuel_key". Optional.'), '"/etc/ironic/fuel_key". Optional.'),
'fuel_ssh_port': _('SSH port; default is 22. Optional.'), 'fuel_ssh_port': _('SSH port; default is 22. Optional.'),
'fuel_deploy_script': _('path to Fuel Agent executable entry point; ' 'fuel_deploy_script': _('path to Bareon executable entry point; '
'default is "provision" Optional.'), 'default is "bareon-provision" Optional.'),
} }
COMMON_PROPERTIES = OTHER_PROPERTIES COMMON_PROPERTIES = OTHER_PROPERTIES
@ -119,7 +119,7 @@ def _parse_driver_info(node):
'driver_info:\n%s') % '\n'.join(error_msgs)) 'driver_info:\n%s') % '\n'.join(error_msgs))
raise exception.InvalidParameterValue(msg) raise exception.InvalidParameterValue(msg)
d_info['script'] = info.get('fuel_deploy_script', 'provision') d_info['script'] = info.get('fuel_deploy_script', 'bareon-provision')
return d_info return d_info

17
setup.cfg
View File

@ -14,15 +14,14 @@ packages =
[entry_points] [entry_points]
console_scripts = console_scripts =
# TODO(kozhukalov): rename entry point bareon-provision = bareon.cmd.agent:provision
provision = bareon.cmd.agent:provision bareon-partition = bareon.cmd.agent:partition
fa_partition = bareon.cmd.agent:partition bareon-configdrive = bareon.cmd.agent:configdrive
fa_configdrive = bareon.cmd.agent:configdrive bareon-copyimage = bareon.cmd.agent:copyimage
fa_copyimage = bareon.cmd.agent:copyimage bareon-bootloader = bareon.cmd.agent:bootloader
fa_bootloader = bareon.cmd.agent:bootloader bareon-build-image = bareon.cmd.agent:build_image
fa_build_image = bareon.cmd.agent:build_image bareon-ironic-callback = bareon.cmd.ironic_callback:main
fa_ironic_callback = bareon.cmd.ironic_callback:main bareon-mkbootstrap = bareon.cmd.agent:mkbootstrap
fa_mkbootstrap = bareon.cmd.agent:mkbootstrap
bareon.drivers = bareon.drivers =
nailgun = bareon.drivers.nailgun:Nailgun nailgun = bareon.drivers.nailgun:Nailgun