++
+ %= include_branding 'docbox'
+
+-
++
+ %= include_branding 'sponsorbox'
+
+
diff --git a/init-rocky-openqa-developer-host.yml b/init-rocky-openqa-developer-host.yml
index 811a5b9..11fbed0 100644
--- a/init-rocky-openqa-developer-host.yml
+++ b/init-rocky-openqa-developer-host.yml
@@ -20,6 +20,7 @@
become: true
vars_files:
- vars/openqa.yml
+ - vars/openqa_branding.yml
# This is to try to avoid the handler issue in pre/post tasks
handlers:
@@ -43,6 +44,15 @@
- name: Install and configure OpenQA
ansible.builtin.import_tasks: tasks/openqa.yml
+ - name: Apply Rocky Linux OpenQA Branding
+ ansible.builtin.import_tasks: tasks/openqa_branding.yml
+
+ - name: Configure multivm networking
+ ansible.builtin.import_tasks: tasks/openqa-multivm-networking.yml
+ vars:
+ openqa_multivm_bridge_interface: br0
+ tags: multivm
+
post_tasks:
- name: Touching run file that ansible has ran here
ansible.builtin.file:
diff --git a/tasks/openqa_branding.yml b/tasks/openqa_branding.yml
new file mode 100644
index 0000000..29f6e6e
--- /dev/null
+++ b/tasks/openqa_branding.yml
@@ -0,0 +1,35 @@
+---
+- name: Copy assets hierarchy
+ ansible.posix.synchronize:
+ src: "{{ assets_src_dir }}/"
+ dest: "{{ assets_dest_dir }}"
+ recursive: true
+ tags:
+ - branding
+
+- name: Copy templates hierarchy
+ ansible.posix.synchronize:
+ src: "{{ templates_src_dir }}/"
+ dest: "{{ templates_dest_dir }}"
+ recursive: true
+ tags:
+ - branding
+
+- name: Apply patches to specific assets, template and config files
+ ansible.posix.patch:
+ src: "{{ item.patch }}"
+ dest: "{{ item.path }}"
+ # optional parameters, see documentation for details
+ # strip: 1
+ backup: true
+ with_items: "{{ branding_patches }}"
+ tags:
+ - branding
+
+- name: Restart openqa-webui service
+ ansible.builtin.systemd:
+ name: openqa-webui
+ state: restarted
+ tags:
+ - branding
+...
diff --git a/templates/etc/openqa/openqa.ini.j2 b/templates/etc/openqa/openqa.ini.j2
index 932c182..7cadafc 100644
--- a/templates/etc/openqa/openqa.ini.j2
+++ b/templates/etc/openqa/openqa.ini.j2
@@ -1,5 +1,5 @@
[global]
-branding=plain
+branding = {{ openqa_branding }}
download_domains = rockylinux.org fedoraproject.org opensuse.org
[auth]
diff --git a/vars/openqa_branding.yml b/vars/openqa_branding.yml
new file mode 100644
index 0000000..ad577d8
--- /dev/null
+++ b/vars/openqa_branding.yml
@@ -0,0 +1,14 @@
+---
+# Branding type used, default is plain but we are rocky
+openqa_branding: "rocky"
+
+assets_src_dir: "{{ playbook_dir }}/files/usr/share/openqa/assets"
+assets_dest_dir: "/usr/share/openqa/assets"
+
+templates_src_dir: "{{ playbook_dir }}/files/usr/share/openqa/templates"
+templates_dest_dir: "/usr/share/openqa/templates"
+
+branding_patches:
+ - {path: /usr/share/openqa/assets/assetpack.def, patch: /usr/share/openqa/assets/assetpack.def.patch}
+ - {path: /usr/share/openqa/templates/webapi/main/index.html.ep, patch: /usr/share/openqa/templates/webapi/main/index.html.ep.patch}
+...
+
+