From: Kefu Chai <kchai@redhat.com>
Date: Thu, 19 Nov 2020 08:03:29 +0000 (+0800)
Subject: doc: pass graphviz options in conf.py
X-Git-Tag: v16.1.0~542^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3c0bc49875ec330c13ec629a9e8d60c65b0d040a;p=ceph.git

doc: pass graphviz options in conf.py

easier to maintain the options of sphinx extensions in a single place.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/admin/build-doc b/admin/build-doc
index 52e9086bff18..979bba4b85e9 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -127,7 +127,6 @@ for target in $sphinx_targets; do
     case $target in
         html)
             builder=dirhtml
-            extra_opt="-D graphviz_output_format=svg"
             ;;
         man)
             extra_opt="-t man"
diff --git a/doc/conf.py b/doc/conf.py
index cc6dc8db0214..74ee96562338 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -114,6 +114,9 @@ breathe_doxygen_config_options = {
 edit_on_github_project = 'ceph/ceph'
 edit_on_github_branch = 'master'
 
+# graphviz options
+graphviz_output_format = 'svg'
+
 def generate_state_diagram(input_paths, output_path):
     sys.path.append(os.path.join(top_level, 'doc', 'scripts'))
     from gen_state_diagram import do_filter, StateMachineRenderer