ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-27 12:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge doc fragments in earlier (#52193)

Browse source 
* Merge doc fragments in earlier

* Move it even higher

* Remove errant docs key

* Fix type
This commit is contained in:
Matt Martz 2019-02-19 09:02:12 -06:00 • committed by GitHub
parent 19f069c041
commit b54086ef02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/plugins/doc_fragments/asa.py
View file

@ -41,7 +41,7 @@ options:
- Specifies the DNS host name or address for connecting to the remote - Specifies the DNS host name or address for connecting to the remote
device over the specified transport. The value of host is used as device over the specified transport. The value of host is used as
the destination address for the transport. the destination address for the transport.
type: host type: str
port: port:
description: description:
- Specifies the port to use when building the connection to the remote - Specifies the port to use when building the connection to the remote

3
lib/ansible/plugins/doc_fragments/netapp.py
View file

@ -140,8 +140,7 @@ options:
required: true required: true
description: description:
- The url to the SANtricity Web Services Proxy or Embedded Web Services API. - The url to the SANtricity Web Services Proxy or Embedded Web Services API.
example: Example https://prod-1.wahoo.acme.com/devmgr/v2
- https://prod-1.wahoo.acme.com/devmgr/v2
validate_certs: validate_certs:
required: false required: false
default: true default: true

4
test/sanity/validate-modules/main.py
View file

@ -985,6 +985,8 @@ class ModuleValidator(Validator):
msg='Unknown DOCUMENTATION error, see TRACE: %s' % e msg='Unknown DOCUMENTATION error, see TRACE: %s' % e
) )
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
if 'options' in doc and doc['options'] is None: if 'options' in doc and doc['options'] is None:
self.reporter.error( self.reporter.error(
path=self.object_path, path=self.object_path,
@ -1005,8 +1007,6 @@ class ModuleValidator(Validator):
# This is the normal case # This is the normal case
self._validate_docs_schema(doc, doc_schema(self.object_name.split('.')[0]), 'DOCUMENTATION', 305) self._validate_docs_schema(doc, doc_schema(self.object_name.split('.')[0]), 'DOCUMENTATION', 305)
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
existing_doc = self._check_for_new_args(doc, metadata) existing_doc = self._check_for_new_args(doc, metadata)
self._check_version_added(doc, existing_doc) self._check_version_added(doc, existing_doc)