diff --git a/Changelog b/Changelog index 693f31246a573905eecaecbf8d15137d0d797113..03373300742b358688f9a44d6873440b089315b2 100644 --- a/Changelog +++ b/Changelog @@ -25,4 +25,5 @@ Features: - Update account API commands to reflect changes in synnefo 0.16 - Implement a get_endpoint_url method and use it - Rename kamaki.clients.Client.base_url --> endpoint_url, keep BW compatibility [#9] +- Remove deprecated --hard argument in "kamaki server reboot" diff --git a/kamaki/cli/cmds/cyclades.py b/kamaki/cli/cmds/cyclades.py index 47cd0e2f6e4c9d892d560b737176ff238855441a..c7c56b2f0724f0679ce844f80ccf947fa4791f8b 100644 --- a/kamaki/cli/cmds/cyclades.py +++ b/kamaki/cli/cmds/cyclades.py @@ -744,8 +744,6 @@ class server_reboot(_CycladesInit, _ServerWait): """Reboot a virtual server""" arguments = dict( - hard=FlagArgument( - 'perform a hard reboot (deprecated)', ('-f', '--force')), type=ValueArgument('SOFT or HARD - default: SOFT', ('--type')), wait=FlagArgument('Wait server to be destroyed', ('-w', '--wait')) ) @@ -754,11 +752,7 @@ class server_reboot(_CycladesInit, _ServerWait): @errors.Cyclades.connection @errors.Cyclades.server_id def _run(self, server_id): - hard_reboot = self['hard'] - if hard_reboot: - self.error( - 'WARNING: -f/--force will be deprecated in version 0.12\n' - '\tIn the future, please use --type=hard instead') + hard_reboot = None if self['type']: if self['type'].lower() in ('soft', ): hard_reboot = False