Skip to content

Commit b54086e

Browse files
authored
Merge doc fragments in earlier (ansible#52193)
* Merge doc fragments in earlier * Move it even higher * Remove errant docs key * Fix type
1 parent 19f069c commit b54086e

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

lib/ansible/plugins/doc_fragments/asa.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ModuleDocFragment(object):
4141
- Specifies the DNS host name or address for connecting to the remote
4242
device over the specified transport. The value of host is used as
4343
the destination address for the transport.
44-
type: host
44+
type: str
4545
port:
4646
description:
4747
- Specifies the port to use when building the connection to the remote

lib/ansible/plugins/doc_fragments/netapp.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ class ModuleDocFragment(object):
140140
required: true
141141
description:
142142
- The url to the SANtricity Web Services Proxy or Embedded Web Services API.
143-
example:
144-
- https://prod-1.wahoo.acme.com/devmgr/v2
143+
Example https://prod-1.wahoo.acme.com/devmgr/v2
145144
validate_certs:
146145
required: false
147146
default: true

test/sanity/validate-modules/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -985,6 +985,8 @@ def _validate_docs(self):
985985
msg='Unknown DOCUMENTATION error, see TRACE: %s' % e
986986
)
987987

988+
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
989+
988990
if 'options' in doc and doc['options'] is None:
989991
self.reporter.error(
990992
path=self.object_path,
@@ -1005,8 +1007,6 @@ def _validate_docs(self):
10051007
# This is the normal case
10061008
self._validate_docs_schema(doc, doc_schema(self.object_name.split('.')[0]), 'DOCUMENTATION', 305)
10071009

1008-
add_fragments(doc, self.object_path, fragment_loader=fragment_loader)
1009-
10101010
existing_doc = self._check_for_new_args(doc, metadata)
10111011
self._check_version_added(doc, existing_doc)
10121012

0 commit comments

Comments
 (0)