Merge branch 'master' of git.devops.thengo.intranet:chaotika/ansible-role-live-build

defaults/main.yml

@@ -6,3 +6,8 @@ live_build_bootappend_live: boot=live components quiet {{ live_build_serial_cons
 live_build_hostname: "{{ inventory_hostname }}"
 
 live_build_distribution: stretch
+
+debian_nonfree_firmware: true
+
+debian_live_debian_installer: live
+live_build_directory: /opt/live

tasks/config.yaml

@@ -14,7 +14,36 @@
 - name: lb config
   command:
     lb config
-    {{ lookup('template','lb-config-args.j2') }}
+
+    {% if live_build_distribution is defined %}
+    --distribution "{{ live_build_distribution }}"
+    {% endif %}
+
+    --mirror-bootstrap "{{ debian_mirror }}"
+    --mirror-chroot-security "{{ debian_security_mirror }}"
+    --mirror-binary "{{ debian_mirror }}"
+    --mirror-binary-security "{{ debian_security_mirror }}"
+
+    {% if debian_nonfree_firmware %}
+    --archive-areas "main contrib non-free"
+    --firmware-chroot true
+    {% endif %}
+
+    {% if live_build_bootappend_live is defined %}
+    --bootappend-live "{{ live_build_bootappend_live }}"
+    {% endif %}
+
+    {% if (debian_backports is defined) and (debian_backports == true)  %}
+    --backports true
+    {% endif %}
+
+    {% if debian_live_debian_installer is defined %}
+    --debian-installer "{{ debian_live_debian_installer }}"
+    --debian-installer-gui "{{ live_build_debian_installer_gui | default(false) }}"
+    {% if debian_nonfree_firmware %}
+    --firmware-binary true
+    {% endif %}
+    {% endif %}
   args:
     chdir: "{{ live_build_directory }}"
 

tasks/setup.yaml

@@ -1,9 +1,7 @@
 ---
-- name: install apt packages
+- name: debian packages
   apt:
-    pkg: "{{ item }}"
-    state: installed
-  with_items:
-    - live-build
-    - memtest86
-    - memtest86+
+    pkg:
+      - live-build
+      - memtest86
+      - memtest86+

templates/lb-config-args.j2

@@ -1,24 +0,0 @@
-{% if live_build_distribution is defined %}
---distribution "{{ live_build_distribution }}"
-{% endif %}
---mirror-bootstrap "{{ debian_mirror }}"
---mirror-chroot-security "{{ debian_security_mirror }}"
---mirror-binary "{{ debian_mirror }}"
---mirror-binary-security "{{ debian_security_mirror }}"
-{% if debian_nonfree_firmware %}
---archive-areas "main contrib non-free"
---firmware-chroot true
-{% endif %}
-{% if live_build_bootappend_live is defined %}
---bootappend-live "{{ live_build_bootappend_live }}"
-{% endif %}
-{% if (debian_backports is defined) and (debian_backports == true)  %}
---backports true
-{% endif %}
-{% if live_build_debian_installer is defined %}
---debian-installer "{{ live_build_debian_installer }}"
---debian-installer-gui false
-{% if debian_nonfree_firmware %}
---firmware-binary true
-{% endif %}
-{% endif %}