diff --git a/playbooks/run.yaml b/playbooks/run.yaml index 2d91e3ba..bb584419 100644 --- a/playbooks/run.yaml +++ b/playbooks/run.yaml @@ -25,6 +25,7 @@ dest: "{{ ansible_user_dir }}/{{ doc.0.repository }}/{{ doc.1.rst_location }}" source: "{{ zuul.project.src_dir }}/{{ doc.1.html_location }}" doc_title: "{{ [ doc.0.service_title, doc.1.title ] | join(' - ') }}" + doc_short_title: "{{ doc.1.title | default(None) }}" doc_environment: "{{ doc.0.service_environment | default(None) }}" doc_link: "{{ doc.1.link | default(None) }}" doc_type: "{{ doc.1.type | default(None) }}" diff --git a/roles/convert_doc/tasks/main.yaml b/roles/convert_doc/tasks/main.yaml index 5d5df96e..120603f9 100644 --- a/roles/convert_doc/tasks/main.yaml +++ b/roles/convert_doc/tasks/main.yaml @@ -20,6 +20,13 @@ - "doc_title is defined" - "doc_title | length > 0" +- name: Add document title to parameters + ansible.builtin.set_fact: + convert_params: "{{ convert_params }} --doc-title '{{ doc_short_title }}'" + when: + - "doc_short_title is defined" + - "doc_short_title | length > 0" + - name: Add environment to parameters ansible.builtin.set_fact: convert_params: "{{ convert_params }} --doc-environment '{{ doc_environment }}'" diff --git a/templates/conf.py b/templates/conf.py index 8d640baa..c578a1ca 100644 --- a/templates/conf.py +++ b/templates/conf.py @@ -33,7 +33,7 @@ otcdocs_git_type = 'gitea' # Those variables are needed for indexing into OpenSearch otcdocs_doc_environment = '{{ doc_environment }}' otcdocs_doc_link = '{{ doc_link }}' -otcdocs_doc_title = '{{ title }}' +otcdocs_doc_title = '{{ doc_title }}' otcdocs_doc_type = '{{ doc_type }}' otcdocs_service_category = '{{ service_category }}' otcdocs_service_title = '{{ service_title }}'