Skip to content

Commit f8f045c

Browse files
committed
docs: fix doc build issues and update antsibull-docs
1 parent d836af3 commit f8f045c

File tree

10 files changed

+20
-12
lines changed

10 files changed

+20
-12
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ jobs:
313313
run: poetry add ansible-core^2.16
314314

315315
- name: Add antsibull-docs
316-
run: poetry add antsibull-docs^1.11.0
316+
run: poetry add antsibull-docs
317317

318318
- name: Install dependencies
319319
run: poetry install

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ help:
2929

3030
.PHONY: docs
3131
docs: ## Build collection documentation
32+
rm -rf docs/html
33+
rm -rf docs/source/modules
3234
mkdir antsibull
33-
poetry run antsibull-docs collection --use-current --dest-dir antsibull --no-indexes collections paloaltonetworks.panos
35+
poetry run antsibull-docs collection --use-current --dest-dir antsibull --no-indexes paloaltonetworks.panos
3436
mkdir -p docs/source/modules
3537
mv antsibull/collections/paloaltonetworks/panos/* docs/source/modules
3638
rm -rf antsibull

docs/source/conf.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44

55
extensions = [
66
"sphinx_rtd_theme",
7+
"sphinx.ext.autodoc",
8+
"sphinx.ext.intersphinx",
9+
"sphinx_antsibull_ext"
710
]
811
exclude_patterns = []
912

13+
intersphinx_mapping = {
14+
'ansible': ('https://docs.ansible.com/ansible/latest/', None),
15+
}
16+
1017
html_theme = "sphinx_rtd_theme"
1118
html_context = {
1219
"display_github": True,
1320
"github_user": "PaloAltoNetworks",
1421
"github_repo": "pan-os-ansible",
15-
"github_version": "master",
22+
"github_version": "main",
1623
"conf_py_path": "/docs/source/",
1724
}

docs/source/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ Then in your playbooks you can specify that you want to use the
5050
examples
5151
modules
5252
history
53-
contributing
5453
authors
5554
license
5655

plugins/doc_fragments/fragments.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ class ModuleDocFragment(object):
323323
- after
324324
type: str
325325
existing_rule:
326-
description: >
326+
description:
327327
- If I(location=before) or I(location=after), this option specifies
328328
an existing rule name. The rule being managed by this module will
329329
be positioned relative to the value of this parameter.

plugins/modules/panos_dhcp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
---
2424
module: panos_dhcp
2525
short_description: Manage DHCP for an interface.
26-
description: >
26+
description:
2727
- Manage DHCP on PAN-OS firewall.
2828
- Besides I(state=gathered) to see the the entire DHCP config related to a
2929
specific interface, you will need to use this module to delete the interface

plugins/modules/panos_dhcp_relay.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
---
2424
module: panos_dhcp_relay
2525
short_description: Manage dhcp relay.
26-
description: >
26+
description:
2727
- Manage dhcp relay on PAN-OS firewall.
2828
- Due to the implementation details of PAN-OS itself, you can use this
2929
module to create a DHCP config without ever having to use M(paloaltonetworks.panos.panos_dhcp)

plugins/modules/panos_ike_crypto_profile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
---
2424
module: panos_ike_crypto_profile
2525
short_description: Manage IKE Crypto profile on the firewall with subset of settings
26-
description: >
26+
description:
2727
- Use the IKE Crypto Profiles page to specify protocols and algorithms for
2828
identification, authentication, and encryption (IKEv1 or IKEv2, Phase 1).
2929
author: "Ivan Bojer (@ivanbojer)"
@@ -98,7 +98,7 @@
9898
- IKE phase 1 key lifetime in days.
9999
type: int
100100
authentication_multiple:
101-
description: >
101+
description:
102102
- PAN-OS 7.0 and above.
103103
- IKEv2 SA reauthentication interval equals I(authentication_multiple)
104104
times lifetime; 0 means reauthentication is disabled.

plugins/modules/panos_nat_rule2.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
---
2424
module: panos_nat_rule2
2525
short_description: Manage a NAT rule
26-
description: >
26+
description:
2727
- Manage a policy NAT rule.
28-
- NOTE: Even though this module supports I(state=merged), due to the
28+
- NOTE Even though this module supports I(state=merged), due to the
2929
complexity of the XML schema for NAT rules, changing a NAT rule's types
3030
using I(state=merged) will likely result in an error. Using I(state=merged)
3131
will work as normal for simple operations, such as adding additional IP addresses

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ six = "*"
3838
pycodestyle = "*"
3939
requests = ">=2.22.0,<3.0"
4040
toml = "*"
41-
antsibull-docs = ">=1.11.0,<2.0"
41+
antsibull-docs = "*"
4242

4343
[tool.poetry.group.ansible-ee]
4444
optional = true

0 commit comments

Comments
 (0)