Skip to content

Fix showroom iframe quote and URL scheme for port 80 #9895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbethell-1 merged 2 commits into from
Aug 3, 2026
Merged

Fix showroom iframe quote and URL scheme for port 80 #9895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cb9de8
Fix stray quote in showroom index.html.j2 iframe src
rhjcd Aug 1, 2026
9ecc125
Fix showroom URL scheme when using port 80
rhjcd Aug 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ansible/roles/showroom/tasks/60-showroom-verify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,25 @@

- name: Compute port suffix when non-standard port is used
ansible.builtin.set_fact:
f_port_suffix: "{% if (showroom_primary_port | default(443) | int) != 443 %}:{{ showroom_primary_port }}{% endif %}"
f_port_suffix: >-
{% if (showroom_primary_port | default(443) | int) not in [443, 80] -%}
:{{ showroom_primary_port }}
{%- endif %}

- name: Compute URL scheme
ansible.builtin.set_fact:
f_url_scheme: >-
{% if (showroom_primary_port | default(443) | int) == 80 -%}
http
{%- else -%}
https
{%- endif %}

- name: Capture lab_ui_url as fact
ansible.builtin.set_fact:
f_lab_ui_url: "https://{{ showroom_host }}{{ f_port_suffix | default('') }}/{{ showroom_primary_path }}"
f_lab_ui_url: >-
{{ f_url_scheme }}://{{ showroom_host -}}
{{ f_port_suffix | default('') }}/{{ showroom_primary_path }}

- name: Output showroom view(s) URLs as userinfo and userdata
agnosticd_user_info:
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/showroom/templates/index.html.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% elif showroom_tab_services | length > 0 %}
<div class="content">
<div class="split left">
<iframe id="doc" src="./{{ showroom_component_name }}/"index.html" width="100%" style="border:none;"></iframe>
<iframe id="doc" src="./{{ showroom_component_name }}/index.html" width="100%" style="border:none;"></iframe>
</div>
<div class="split right">
<div class="tab">
Expand Down
Loading