summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-09-22 14:51:47 +0000
committerGerrit Code Review <review@openstack.org>2020-09-22 14:51:47 +0000
commitdce2afd7898d618336e1859283bcedea8336a7a2 (patch)
tree3c04c3eff46319bffc65c547abbe93683ea604c8
parent5e1011a630b3ae4ac90ff771fc1e05b79038fc4c (diff)
parent01f63b875e6534a90ded876c88115f8e5eb0c7f6 (diff)
downloadoslo-config-dce2afd7898d618336e1859283bcedea8336a7a2.tar.gz
Merge "sphinxext: Add 'merge_domaindata'"
-rw-r--r--oslo_config/sphinxext.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/oslo_config/sphinxext.py b/oslo_config/sphinxext.py
index 4a11163..6aadf73 100644
--- a/oslo_config/sphinxext.py
+++ b/oslo_config/sphinxext.py
@@ -495,6 +495,15 @@ class ConfigDomain(Domain):
)
return None
+ def merge_domaindata(self, docnames, otherdata):
+ for target, docname in otherdata['options'].items():
+ if docname in docnames:
+ self.data['options'][target] = docname
+
+ for target, docname in otherdata['groups'].items():
+ if docname in docnames:
+ self.data['groups'][target] = docname
+
def setup(app):
# NOTE(dhellmann): Try to turn off lazy translation from oslo_i18n