From 9ce36dc684cba44f977e03aee9a0157900875a73 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 3 Jun 2020 18:42: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: I495d48d0c2a9d83e987bf04abc78fbd15fd6a761
---
 doc/source/conf.py          | 12 ++++--------
 releasenotes/source/conf.py | 11 +++--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 56b04f9f..5022640a 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -65,15 +65,11 @@ role_name = 'os_octavia'
 target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Documentation: ' + role_name + ' role'
 
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = (
-    "https://opendev.org/openstack/{}".format(target_name)
-)
-
 # 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 = ''
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 99e9356a..024434e4 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -62,11 +62,6 @@ role_name = 'os_heat'
 target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = (
-    "https://opendev.org/openstack/{}".format(target_name)
-)
-
 # Release notes do not need a version number in the title, they
 # cover multiple releases.
 # The full version, including alpha/beta/rc tags.
@@ -75,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.