From 209dda107f5b7ffc98510c138ab4d816f40f99df Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 3 Jun 2020 18:37:31 +0200
Subject: [PATCH] Use newer openstackdocstheme and reno versions

The sync from https://review.opendev.org/733244 updated to
openstackdocstheme 2.2.1 and reno 3.1.0 versions.

Set openstackdocs_pdf_link to link to PDF file. Note that
the link to the published document only works on docs.openstack.org
where the PDF file is placed in the top-level html directory. The
site-preview places the PDF in a pdf directory.

openstackdocstheme renames some variables, so follow the renames
before the next release removes them. A couple of variables are also
not needed anymore, remove them.

See also
http://lists.openstack.org/pipermail/openstack-discuss/2020-May/014971.html

Change-Id: Iecbe3fa0e8cafb7a69d398d2bb039693c7d24957
---
 doc/source/conf.py          | 7 ++++---
 releasenotes/source/conf.py | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 1c30d31a..f74922b9 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -76,9 +76,10 @@ deploy_guide_prefix = "https://docs.openstack.org/project-deploy-guide/openstack
 extlinks = {'deploy_guide': (deploy_guide_prefix, '')}
 
 # openstackdocstheme options
-repository_name = 'openstack/' + target_name
-bug_project = project.lower()
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/' + target_name
+openstackdocs_pdf_link = True
+openstackdocs_bug_project = project.lower()
+openstackdocs_bug_tag = ''
 
 # for a list of supported languages.
 #
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 08b95f2f..a6740f6c 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -70,9 +70,9 @@ release = ''
 version = ''
 
 # openstackdocstheme options
-repository_name = 'openstack/' + target_name
-bug_project = project.lower()
-bug_tag = ''
+openstackdocs_repo_name = 'openstack/' + target_name
+openstackdocs_bug_project = project.lower()
+openstackdocs_bug_tag = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.