update scripts for latest templates

otc_metadata/templates/conf.py.j2

@@ -27,12 +27,12 @@ otcdocs_auto_version = False
 project = '{{ project }}'
 otcdocs_repo_name = '{{ repo_name }}'
 # Those variables are required for edit/bug links
-{% if git_fqdn -%}
+{%- if git_fqdn %}
 otcdocs_git_fqdn = '{{ git_fqdn }}'
-{% endif %}
-{% if git_type -%}
+{%- endif %}
+{%- if git_type %}
 otcdocs_git_type = '{{ git_type }}'
-{% endif %}
+{%- endif %}
 
 # 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
@@ -82,6 +82,15 @@ html_theme = 'otcdocs'
 # further. For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
+{%- if html_options is defined -%}
+{%- for (k, v) in html_options.items() %}
+{%- if v is boolean %}
+    "{{ k }}": {{ v }},
+{%- else %}
+    "{{ k }}": "{{ v }}",
+{%- endif %}
+{%- endfor %}
+{%- endif %}
 }
 
 # The name for this set of Sphinx documents.  If None, it defaults to
@@ -97,10 +106,11 @@ html_static_path = ['_static']
 
 # -- Options for PDF output --------------------------------------------------
 latex_documents = [
-{% if pdf_name is defined -%}
+{%- if pdf_name is defined %}
     ('index',
      '{{ pdf_name }}.tex',
      u'{{ title }}',
      u'OpenTelekomCloud', 'manual'),
 {% endif -%}
 ]
+