From d5503f97eeb8dba8efefca086aaab01ecb016d78 Mon Sep 17 00:00:00 2001
From: Nguyen Phuong An <AnNP@vn.fujitsu.com>
Date: Wed, 7 Sep 2016 10:43:54 +0700
Subject: [api-ref] Remove temporary block in conf.py

The os-api-ref 1.0.0 is out. We can remove the support to older version now.
Reference:
https://github.com/openstack/senlin/commit/6d41feb58dd836d426c9b6f025846dbbf7295097

Change-Id: I14266932bf6f936991f1ea675f3e61431b4a0b1c
---
 api-ref/source/conf.py | 36 +++++++++---------------------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index fe1164aab..bf3c54274 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -28,35 +28,17 @@ import os
 import subprocess
 import sys
 
-# TODO(Graham Hayes): Remove the following block of code when os-api-ref is
-# using openstackdocstheme
+import openstackdocstheme
 
-import os_api_ref
+html_theme = 'openstackdocs'
+html_theme_path = [openstackdocstheme.get_html_theme_path()]
+html_theme_options = {
+    "sidebar_mode": "toc",
+}
 
-if getattr(os_api_ref, 'THEME', 'olsosphinx') == 'openstackdocstheme':
-    # We are on the new version with openstackdocstheme support
-
-    extensions = [
-        'os_api_ref',
-    ]
-
-    import openstackdocstheme  # noqa
-
-    html_theme = 'openstackdocs'
-    html_theme_path = [openstackdocstheme.get_html_theme_path()]
-    html_theme_options = {
-        "sidebar_mode": "toc",
-    }
-
-else:
-    # We are on the old version without openstackdocstheme support
-
-    extensions = [
-        'os_api_ref',
-        'oslosphinx',
-    ]
-
-# End temporary block
+extensions = [
+    'os_api_ref',
+]
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
-- 
cgit v1.2.1