openstack/openstack-ansible
Code Issues Proposed changes

Merge "[Docs] Fix docs for latest openstackdocstheme"

Browse Source
This commit is contained in:
Zuul 2018-03-29 18:47:48 +00:00 committed by Gerrit Code Review
commit 96f52832ef
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/source/conf.py
View File

@ -36,15 +36,15 @@ description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
previous_series_name = 'queens' previous_series_name = 'queens'
current_series_name = 'rocky' current_series_name = 'rocky'
# General information about the project. ## General information about the project.
author = 'OpenStack-Ansible Contributors' author = 'OpenStack-Ansible Contributors'
category = 'Miscellaneous' category = 'Miscellaneous'
copyright = '2014-2017, OpenStack-Ansible Contributors' copyright = '2014-2018, OpenStack-Ansible Contributors'
project = 'OpenStack-Ansible'
title = 'OpenStack-Ansible Documentation' title = 'OpenStack-Ansible Documentation'
# Smart variable replacements # Smart variable replacements with what we can. The openstackdocstheme has
current_series = openstackdocstheme.get_series_name() # no stable interface though. This works with 1.20.
current_series = openstackdocstheme.ext._get_series_name()
if current_series == "latest": if current_series == "latest":
watermark = "Pre-release" watermark = "Pre-release"
@ -57,10 +57,6 @@ else:
branch = "stable/{}".format(current_series) branch = "stable/{}".format(current_series)
upgrade_warning = "The upgrade is always under active development." upgrade_warning = "The upgrade is always under active development."
# Ensure the top left corner of openstack docs theme
# is consistent with latest available tag
version = latest_tag
CONF_PATH = os.path.dirname(os.path.realpath(__file__)) CONF_PATH = os.path.dirname(os.path.realpath(__file__))
GNOCCHI_DETAILS = '../../playbooks/defaults/repo_packages/gnocchi.yml' GNOCCHI_DETAILS = '../../playbooks/defaults/repo_packages/gnocchi.yml'
with open(os.path.join(CONF_PATH, GNOCCHI_DETAILS), 'r') as fdesc: with open(os.path.join(CONF_PATH, GNOCCHI_DETAILS), 'r') as fdesc:
@ -140,7 +136,8 @@ master_doc = 'index'
# openstackdocstheme options # openstackdocstheme options
repository_name = 'openstack/' + target_name repository_name = 'openstack/' + target_name
bug_project = project.lower() # The bug project is always the same for all our repos
bug_project = 'openstack-ansible'
bug_tag = '' bug_tag = ''
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
@ -334,7 +331,7 @@ man_pages = [
# dir menu entry, description, category) # dir menu entry, description, category)
texinfo_documents = [ texinfo_documents = [
(master_doc, target_name, (master_doc, target_name,
title, author, project, title, author, bug_project,
description, category), description, category),
] ]