From b2298753ae4c1fe3fc386ad8c8a1c73ab0388741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Thu, 11 Oct 2018 17:59:31 +0200 Subject: [PATCH] plugin: validate lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make python linter happy. Signed-off-by: Sébastien Han (cherry picked from commit e2467272f86bbba064ef3928b14f927a6b0fa3d4) --- plugins/actions/validate.py | 114 +++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 48 deletions(-) diff --git a/plugins/actions/validate.py b/plugins/actions/validate.py index 9e81a9d52..ee04bbd5b 100644 --- a/plugins/actions/validate.py +++ b/plugins/actions/validate.py @@ -13,7 +13,7 @@ except ImportError: try: import notario except ImportError: - msg = "The python-notario library is missing. Please install it on the node you are running ceph-ansible to continue." + msg = "The python-notario library is missing. Please install it on the node you are running ceph-ansible to continue." # noqa E501 display.error(msg) raise SystemExit(msg) @@ -39,7 +39,7 @@ class ActionModule(ActionBase): host = host_vars['ansible_hostname'] mode = self._task.args.get('mode', 'permissive') - self._supports_check_mode = False # XXX ? + self._supports_check_mode = False # XXX ? self._supports_async = True result = {} @@ -47,36 +47,44 @@ class ActionModule(ActionBase): try: notario_store["groups"] = host_vars["groups"] - notario_store["containerized_deployment"] = host_vars["containerized_deployment"] + notario_store["containerized_deployment"] = host_vars["containerized_deployment"] # noqa E501 notario.validate(host_vars, install_options, defined_keys=True) if host_vars["ceph_origin"] == "repository" and not host_vars["containerized_deployment"]: - notario.validate(host_vars, ceph_origin_repository, defined_keys=True) + notario.validate( + host_vars, ceph_origin_repository, defined_keys=True) if host_vars["ceph_repository"] == "community": - notario.validate(host_vars, ceph_repository_community, defined_keys=True) + notario.validate( + host_vars, ceph_repository_community, defined_keys=True) # noqa E501 if host_vars["ceph_repository"] == "rhcs": - notario.validate(host_vars, ceph_repository_rhcs, defined_keys=True) + notario.validate( + host_vars, ceph_repository_rhcs, defined_keys=True) if host_vars["ceph_repository"] == "dev": - notario.validate(host_vars, ceph_repository_dev, defined_keys=True) + notario.validate( + host_vars, ceph_repository_dev, defined_keys=True) - if host_vars["ceph_repository"] == "uca": - notario.validate(host_vars, ceph_repository_uca, defined_keys=True) - - # store these values because one must be defined and the validation method + # store these values because one must be defined + # and the validation method # will need access to all three through the store - notario_store["monitor_address"] = host_vars.get("monitor_address", None) - notario_store["monitor_address_block"] = host_vars.get("monitor_address_block", None) - notario_store["monitor_interface"] = host_vars.get("monitor_interface", None) + notario_store["monitor_address"] = host_vars.get( + "monitor_address", None) + notario_store["monitor_address_block"] = host_vars.get( + "monitor_address_block", None) + notario_store["monitor_interface"] = host_vars.get( + "monitor_interface", None) if host_vars["mon_group_name"] in host_vars["group_names"]: notario.validate(host_vars, monitor_options, defined_keys=True) - notario_store["radosgw_address"] = host_vars.get("radosgw_address", None) - notario_store["radosgw_address_block"] = host_vars.get("radosgw_address_block", None) - notario_store["radosgw_interface"] = host_vars.get("radosgw_interface", None) + notario_store["radosgw_address"] = host_vars.get( + "radosgw_address", None) + notario_store["radosgw_address_block"] = host_vars.get( + "radosgw_address_block", None) + notario_store["radosgw_interface"] = host_vars.get( + "radosgw_interface", None) if host_vars["rgw_group_name"] in host_vars["group_names"]: notario.validate(host_vars, rados_options, defined_keys=True) @@ -87,30 +95,30 @@ class ActionModule(ActionBase): notario_store['osd_objectstore'] = host_vars["osd_objectstore"] if host_vars["osd_scenario"] == "collocated": if not host_vars.get("osd_auto_discovery", False): - notario.validate(host_vars, collocated_osd_scenario, defined_keys=True) + notario.validate( + host_vars, collocated_osd_scenario, defined_keys=True) # noqa E501 if host_vars["osd_scenario"] == "non-collocated": - notario.validate(host_vars, non_collocated_osd_scenario, defined_keys=True) + notario.validate( + host_vars, non_collocated_osd_scenario, defined_keys=True) # noqa E501 if host_vars["osd_scenario"] == "lvm": - if not host_vars.get("osd_auto_discovery", False): - if host_vars.get("devices"): - notario.validate(host_vars, lvm_batch_scenario, defined_keys=True) - elif notario_store['osd_objectstore'] == 'filestore': - notario.validate(host_vars, lvm_filestore_scenario, defined_keys=True) - elif notario_store['osd_objectstore'] == 'bluestore': - notario.validate(host_vars, lvm_bluestore_scenario, defined_keys=True) + if host_vars.get("devices"): + notario.validate( + host_vars, lvm_batch_scenario, defined_keys=True) + elif notario_store['osd_objectstore'] == 'filestore': + notario.validate( + host_vars, lvm_filestore_scenario, defined_keys=True) # noqa E501 + elif notario_store['osd_objectstore'] == 'bluestore': + notario.validate( + host_vars, lvm_bluestore_scenario, defined_keys=True) # noqa E501 except Invalid as error: - display.vvv("Notario Failure: %s" % str(error)) - msg = "" - if error.path: - msg = "[{}] Validation failed for variable: {}".format(host, error.path[0]) - display.error(msg) - reason = "[{}] Reason: {}".format(host, error.reason) - else: - reason = "[{}] Reason: {}".format(host, str(error)) - given = "" + display.vvvv("Notario Failure: %s" % str(error)) + msg = "[{}] Validation failed for variable: {}".format( + host, error.path[0]) + display.error(msg) + reason = "[{}] Reason: {}".format(host, error.reason) try: if "schema is missing" not in error.message: for i in range(0, len(error.path)): @@ -159,12 +167,14 @@ class ActionModule(ActionBase): def osd_objectstore_choices(value): - assert value in ['bluestore', 'filestore'], "osd_objectstore must be either 'bluestore' or 'filestore'" + assert value in [ + 'bluestore', 'filestore'], "osd_objectstore must be either 'bluestore' or 'filestore'" # noqa E501 def ceph_origin_choices(value): if not notario_store["containerized_deployment"]: - assert value in ['repository', 'distro', 'local'], "ceph_origin must be either 'repository', 'distro' or 'local'" + assert value in ['repository', 'distro', + 'local'], "ceph_origin must be either 'repository', 'distro' or 'local'" # noqa E501 def ceph_repository_choices(value): @@ -173,7 +183,8 @@ def ceph_repository_choices(value): def ceph_repository_type_choices(value): - assert value in ['cdn', 'iso'], "ceph_repository_type must be either 'cdn' or 'iso'" + assert value in [ + 'cdn', 'iso'], "ceph_repository_type must be either 'cdn' or 'iso'" def validate_monitor_options(value): @@ -182,32 +193,38 @@ def validate_monitor_options(value): be defined. """ monitor_address_given = notario_store["monitor_address"] != "0.0.0.0" - monitor_address_block_given = notario_store["monitor_address_block"] != "subnet" + monitor_address_block_given = notario_store["monitor_address_block"] != "subnet" # noqa E501 monitor_interface_given = notario_store["monitor_interface"] != "interface" - msg = "Either monitor_address, monitor_address_block or monitor_interface must be provided" + msg = "Either monitor_address, monitor_address_block or monitor_interface must be provided" # noqa E501 - assert any([monitor_address_given, monitor_address_block_given, monitor_interface_given]), msg + assert any([monitor_address_given, monitor_address_block_given, + monitor_interface_given]), msg def validate_dmcrypt_bool_value(value): - assert value in ["true", True, "false", False], "dmcrypt can be set to true/True or false/False (default)" + assert value in ["true", True, "false", + False], "dmcrypt can be set to true/True or false/False (default)" def validate_osd_auto_discovery_bool_value(value): - assert value in ["true", True, "false", False], "osd_auto_discovery can be set to true/True or false/False (default)" + assert value in ["true", True, "false", + False], "osd_auto_discovery can be set to true/True or false/False (default)" def validate_osd_scenarios(value): - assert value in ["collocated", "non-collocated", "lvm"], "osd_scenario must be set to 'collocated', 'non-collocated' or 'lvm'" + assert value in ["collocated", "non-collocated", + "lvm"], "osd_scenario must be set to 'collocated', 'non-collocated' or 'lvm'" # noqa E501 def validate_objectstore(value): - assert value in ["filestore", "bluestore"], "objectstore must be set to 'filestore' or 'bluestore'" + assert value in [ + "filestore", "bluestore"], "objectstore must be set to 'filestore' or 'bluestore'" # noqa E501 def validate_ceph_stable_release(value): - assert value in CEPH_RELEASES, "ceph_stable_release must be set to one of the following: %s" % ", ".join(CEPH_RELEASES) + assert value in CEPH_RELEASES, "ceph_stable_release must be set to one of the following: %s" % ", ".join( # noqa E501 + CEPH_RELEASES) def validate_rados_options(value): @@ -219,9 +236,10 @@ def validate_rados_options(value): radosgw_address_block_given = notario_store["radosgw_address_block"] != "subnet" radosgw_interface_given = notario_store["radosgw_interface"] != "interface" - msg = "Either radosgw_address, radosgw_address_block or radosgw_interface must be provided" + msg = "Either radosgw_address, radosgw_address_block or radosgw_interface must be provided" # noqa E501 - assert any([radosgw_address_given, radosgw_address_block_given, radosgw_interface_given]), msg + assert any([radosgw_address_given, radosgw_address_block_given, + radosgw_interface_given]), msg install_options = (