Merge "Switch to newer openstackdocstheme and reno versions"

doc/requirements.txt

@@ -1,5 +1,5 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2  # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD

doc/source/conf.py

@@ -27,9 +27,11 @@ extensions = [
 ]
 
 # openstackdocstheme options
-repository_name = 'openstack/devstack-plugin-ceph'
-bug_project = 'devstack-plugin-ceph'
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/devstack-plugin-ceph'
+openstackdocs_bug_project = 'devstack-plugin-ceph'
+openstackdocs_bug_tag = ''
+openstackdocs_auto_version = False
+openstackdocs_auto_name = False
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
 # text edit cycles.
@@ -53,7 +55,7 @@ add_function_parentheses = True
 add_module_names = True
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # -- Options for HTML output --------------------------------------------------