mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-16 09:55:26 -07:00
* fixed validation-modules for plugins/modules/packaging/language/pip_package_info.py
* fixed validation-modules for plugins/modules/packaging/language/maven_artifact.py
* fixed validation-modules for plugins/modules/packaging/language/bundler.py
* fixed validation-modules for plugins/modules/notification/pushbullet.py
* fixed validation-modules for plugins/modules/monitoring/sensu/sensu_handler.py
* fixed validation-modules for plugins/modules/monitoring/sensu/sensu_check.py
* fixed validation-modules for plugins/modules/monitoring/sensu/sensu_client.py
* fixed validation-modules for plugins/modules/monitoring/icinga2_host.py
* fixed validation-modules for plugins/modules/monitoring/datadog/datadog_monitor.py
* fixed validation-modules for plugins/modules/monitoring/datadog/datadog_event.py
* fixed validation-modules for plugins/modules/clustering/znode.py
* fixed validation-modules for plugins/modules/clustering/etcd3.py
* fixed validation-modules for plugins/modules/clustering/consul/consul_session.py
* fixed validation-modules for plugins/modules/clustering/consul/consul_kv.py
* fixed validation-modules for plugins/modules/clustering/consul/consul.py
* fixed validation-modules for plugins/modules/cloud/profitbricks/profitbricks.py
* fixed validation-modules for plugins/modules/cloud/profitbricks/profitbricks_volume.py
* fixed validation-modules for plugins/modules/cloud/packet/packet_sshkey.py
* fixed validation-modules for plugins/modules/cloud/oneandone/oneandone_server.py
* fixed validation-modules for plugins/modules/cloud/oneandone/oneandone_private_network.py
* fixed validation-modules for plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py
* fixed validation-modules for plugins/modules/cloud/oneandone/oneandone_load_balancer.py
* fixed validation-modules for plugins/modules/cloud/oneandone/oneandone_firewall_policy.py
* fixed validation-modules for plugins/modules/cloud/webfaction/webfaction_app.py
* fixed validation-modules for plugins/modules/cloud/webfaction/webfaction_db.py
* fixed validation-modules for plugins/modules/cloud/webfaction/webfaction_domain.py
* fixed validation-modules for plugins/modules/cloud/webfaction/webfaction_mailbox.py
* fixed validation-modules for plugins/modules/cloud/webfaction/webfaction_site.py
* fixed validation-modules for plugins/modules/remote_management/lxca/lxca_cmms.py
* fixed validation-modules for plugins/modules/remote_management/lxca/lxca_nodes.py
* missed one "elements" in sensu_handler
* Tidy up batch of sanity checks ignore lines
* missed lines in ignore-2.9.txt
* fixed validation-modules for plugins/modules/clustering/consul/consul_acl.py
* Update ignore-2.9.txt
Removed consul_acl.py from ignore-2.9.txt
* Apply suggestions from code review
Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
* Update plugins/modules/notification/pushbullet.py
Co-authored-by: Felix Fontein <felix@fontein.de>
* Update plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py
Co-authored-by: Felix Fontein <felix@fontein.de>
* added changelog fragment
* Update plugins/modules/cloud/oneandone/oneandone_monitoring_policy.py
* Update changelogs/fragments/1885-sanity-check-fixes-batch3.yml
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Andrew Klychkov <aaklychkov@mail.ru>
(cherry picked from commit 76d9fe4ec6)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot]
GitHub
parent
be94a014c8
commit
1314b0d7b2
35 changed files with 299 additions and 265 deletions
|
|
@ -33,6 +33,7 @@ requirements:
|
|||
author: "Steve Gargan (@sgargan)"
|
||||
options:
|
||||
state:
|
||||
type: str
|
||||
description:
|
||||
- register or deregister the consul service, defaults to present
|
||||
default: present
|
||||
|
|
@ -86,6 +87,7 @@ options:
|
|||
documentation for further details.
|
||||
tags:
|
||||
type: list
|
||||
elements: str
|
||||
description:
|
||||
- tags that will be attached to the service registration.
|
||||
script:
|
||||
|
|
@ -345,7 +347,7 @@ def remove_service(module, service_id):
|
|||
module.exit_json(changed=False, id=service_id)
|
||||
|
||||
|
||||
def get_consul_api(module, token=None):
|
||||
def get_consul_api(module):
|
||||
consulClient = consul.Consul(host=module.params.get('host'),
|
||||
port=module.params.get('port'),
|
||||
scheme=module.params.get('scheme'),
|
||||
|
|
@ -398,7 +400,7 @@ def parse_service(module):
|
|||
module.fail_json(msg="service_name is required to configure a service.")
|
||||
|
||||
|
||||
class ConsulService():
|
||||
class ConsulService(object):
|
||||
|
||||
def __init__(self, service_id=None, name=None, address=None, port=-1,
|
||||
tags=None, loaded=None):
|
||||
|
|
@ -564,26 +566,26 @@ def main():
|
|||
argument_spec=dict(
|
||||
host=dict(default='localhost'),
|
||||
port=dict(default=8500, type='int'),
|
||||
scheme=dict(required=False, default='http'),
|
||||
validate_certs=dict(required=False, default=True, type='bool'),
|
||||
check_id=dict(required=False),
|
||||
check_name=dict(required=False),
|
||||
check_node=dict(required=False),
|
||||
check_host=dict(required=False),
|
||||
notes=dict(required=False),
|
||||
script=dict(required=False),
|
||||
service_id=dict(required=False),
|
||||
service_name=dict(required=False),
|
||||
service_address=dict(required=False, type='str', default=None),
|
||||
service_port=dict(required=False, type='int', default=None),
|
||||
scheme=dict(default='http'),
|
||||
validate_certs=dict(default=True, type='bool'),
|
||||
check_id=dict(),
|
||||
check_name=dict(),
|
||||
check_node=dict(),
|
||||
check_host=dict(),
|
||||
notes=dict(),
|
||||
script=dict(),
|
||||
service_id=dict(),
|
||||
service_name=dict(),
|
||||
service_address=dict(type='str'),
|
||||
service_port=dict(type='int'),
|
||||
state=dict(default='present', choices=['present', 'absent']),
|
||||
interval=dict(required=False, type='str'),
|
||||
ttl=dict(required=False, type='str'),
|
||||
tcp=dict(required=False, type='str'),
|
||||
http=dict(required=False, type='str'),
|
||||
timeout=dict(required=False, type='str'),
|
||||
tags=dict(required=False, type='list'),
|
||||
token=dict(required=False, no_log=True)
|
||||
interval=dict(type='str'),
|
||||
ttl=dict(type='str'),
|
||||
tcp=dict(type='str'),
|
||||
http=dict(type='str'),
|
||||
timeout=dict(type='str'),
|
||||
tags=dict(type='list', elements='str'),
|
||||
token=dict(no_log=True)
|
||||
),
|
||||
supports_check_mode=False,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue