openstack/kayobe
Code Issues Proposed changes

Ensure kayobe CLI option groups aren't duplicated

Browse Source
This commit is contained in:
Mark Goddard 2017-03-15 09:44:35 +00:00
parent 6e6a554f43
commit c97a73e990
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
kayobe/cli/commands.py
View File

@ -15,9 +15,12 @@ class KayobeAnsibleMixin(object):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(KayobeAnsibleMixin, self).get_parser(prog_name) parser = super(KayobeAnsibleMixin, self).get_parser(prog_name)
group = parser.add_argument_group("Kayobe Ansible") group = parser.add_argument_group("Kayobe Ansible")
ansible.add_args(group) self.add_kayobe_ansible_args(group)
return parser return parser
def add_kayobe_ansible_args(self, group):
ansible.add_args(group)
class KollaAnsibleMixin(object): class KollaAnsibleMixin(object):
"""Mixin class for commands running Kolla Ansible.""" """Mixin class for commands running Kolla Ansible."""
@ -25,9 +28,12 @@ class KollaAnsibleMixin(object):
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(KollaAnsibleMixin, self).get_parser(prog_name) parser = super(KollaAnsibleMixin, self).get_parser(prog_name)
group = parser.add_argument_group("Kolla Ansible") group = parser.add_argument_group("Kolla Ansible")
kolla_ansible.add_args(group) self.add_kolla_ansible_args(group)
return parser return parser
def add_kolla_ansible_args(self, group):
kolla_ansible.add_args(group)
class ControlHostBootstrap(KayobeAnsibleMixin, Command): class ControlHostBootstrap(KayobeAnsibleMixin, Command):
"""Bootstrap the Kayobe control environment.""" """Bootstrap the Kayobe control environment."""
@ -88,12 +94,10 @@ class ConfigurationDump(KayobeAnsibleMixin, Command):
class PlaybookRun(KayobeAnsibleMixin, Command): class PlaybookRun(KayobeAnsibleMixin, Command):
"""Run a Kayobe Ansible playbook.""" """Run a Kayobe Ansible playbook."""
def get_parser(self, prog_name): def add_kayobe_ansible_args(self, group):
parser = super(PlaybookRun, self).get_parser(prog_name) super(PlaybookRun, self).add_kayobe_ansible_args(group)
group = parser.add_argument_group("Kayobe Ansible")
group.add_argument("playbook", nargs="+", group.add_argument("playbook", nargs="+",
help="name of the playbook(s) to run") help="name of the playbook(s) to run")
return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.app.LOG.debug("Running Kayobe playbook(s)") self.app.LOG.debug("Running Kayobe playbook(s)")
@ -103,9 +107,8 @@ class PlaybookRun(KayobeAnsibleMixin, Command):
class KollaAnsibleRun(KollaAnsibleMixin, Command): class KollaAnsibleRun(KollaAnsibleMixin, Command):
"""Run a Kolla Ansible command.""" """Run a Kolla Ansible command."""
def get_parser(self, prog_name): def add_kolla_ansible_args(self, group):
parser = super(KollaAnsibleRun, self).get_parser(prog_name) super(KollaAnsibleRun, self).add_kolla_ansible_args(group)
group = parser.add_argument_group("Kolla Ansible")
group.add_argument("--kolla-inventory-filename", default="overcloud", group.add_argument("--kolla-inventory-filename", default="overcloud",
choices=["seed", "overcloud"], choices=["seed", "overcloud"],
help="name of the kolla-ansible inventory file, " help="name of the kolla-ansible inventory file, "
@ -113,7 +116,6 @@ class KollaAnsibleRun(KollaAnsibleMixin, Command):
"overcloud)") "overcloud)")
group.add_argument("command", group.add_argument("command",
help="name of the kolla-ansible command to run") help="name of the kolla-ansible command to run")
return parser
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.app.LOG.debug("Running Kolla Ansible command") self.app.LOG.debug("Running Kolla Ansible command")