From 424274cbb4247b5e704e751a306e72ec56748c02 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Thu, 31 Aug 2017 00:05:10 +0000 Subject: [PATCH] rename variables to live_build --- defaults/main.yml | 8 ++++---- tasks/main.yml | 34 ++++++++++++++++----------------- templates/common.list.chroot.j2 | 2 +- templates/custom.list.chroot.j2 | 2 +- templates/isolinux.cfg.j2 | 2 +- templates/lb-config-args.j2 | 12 ++++++------ vars/main.yml | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index a1cf333..0e3416e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ debian_mirror: http://deb.debian.org/debian -debian_live_build_serial_console: false -debian_live_build_bootappend_live: boot=live components quiet {{ debian_live_build_serial_console | ternary('console=ttyS0','') }} hostname={{ debian_live_build_hostname }} -debian_live_build_hostname: "{{ inventory_hostname }}" +live_build_serial_console: false +live_build_bootappend_live: boot=live components quiet {{ live_build_serial_console | ternary('console=ttyS0','') }} hostname={{ live_build_hostname }} +live_build_hostname: "{{ inventory_hostname }}" -debian_live_build_distribution: stretch +live_build_distribution: stretch diff --git a/tasks/main.yml b/tasks/main.yml index 8541c5f..f362973 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -14,71 +14,71 @@ - name: debian live-build directory file: - path: "{{ debian_live_build_directory }}" + path: "{{ live_build_directory }}" state: directory - name: remove config directory file: - path: "{{ debian_live_build_directory }}/config" + path: "{{ live_build_directory }}/config" state: absent - name: lb clean command: lb clean args: - chdir: "{{ debian_live_build_directory }}" + chdir: "{{ live_build_directory }}" - name: lb config command: lb config {{ lookup('template','lb-config-args.j2') }} args: - chdir: "{{ debian_live_build_directory }}" + chdir: "{{ live_build_directory }}" - name: ssh root access include_role: name: ssh_root_access vars: - root_target_directory: "{{ debian_live_build_directory }}/config/includes.chroot/" + root_target_directory: "{{ live_build_directory }}/config/includes.chroot/" - name: keyboard configuration include_role: name: keyboard_configuration vars: - root_target_directory: "{{ debian_live_build_directory }}/config/includes.chroot/" - when: debian_live_build_serial_console == false + root_target_directory: "{{ live_build_directory }}/config/includes.chroot/" + when: live_build_serial_console == false - name: include common packages template: src: common.list.chroot.j2 - dest: "{{ debian_live_build_directory }}/config/package-lists/common.list.chroot" + dest: "{{ live_build_directory }}/config/package-lists/common.list.chroot" - name: include console-setup package copy: content: console-setup - dest: "{{ debian_live_build_directory }}/config/package-lists/console-setup.list.chroot" - when: debian_live_build_serial_console == false + dest: "{{ live_build_directory }}/config/package-lists/console-setup.list.chroot" + when: live_build_serial_console == false - name: include custom packages template: src: custom.list.chroot.j2 - dest: "{{ debian_live_build_directory }}/config/package-lists/custom.list.chroot" - when: debian_live_build_custom_packages is defined + dest: "{{ live_build_directory }}/config/package-lists/custom.list.chroot" + when: live_build_custom_packages is defined - name: isolinx directory file: - path: "{{ debian_live_build_directory }}/config/includes.binary/isolinux" + path: "{{ live_build_directory }}/config/includes.binary/isolinux" state: directory - name: isolinux.cfg template: src: isolinux.cfg.j2 - dest: "{{ debian_live_build_directory }}/config/includes.binary/isolinux/isolinux.cfg" + dest: "{{ live_build_directory }}/config/includes.binary/isolinux/isolinux.cfg" - name: fix debian jessie generate ssh host ed25519 keys copy: src: 1160-openssh-server - dest: "{{ debian_live_build_directory }}/config/includes.chroot/lib/live/config/1160-openssh-server" + dest: "{{ live_build_directory }}/config/includes.chroot/lib/live/config/1160-openssh-server" mode: 755 when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' @@ -86,10 +86,10 @@ command: lb build args: - chdir: "{{ debian_live_build_directory }}" + chdir: "{{ live_build_directory }}" register: _lb_build - name: save build log copy: content: "{{ _lb_build.stdout }}" - dest: "{{ debian_live_build_directory }}/build.log" + dest: "{{ live_build_directory }}/build.log" diff --git a/templates/common.list.chroot.j2 b/templates/common.list.chroot.j2 index 7f87c6a..fe3391f 100644 --- a/templates/common.list.chroot.j2 +++ b/templates/common.list.chroot.j2 @@ -1,3 +1,3 @@ -{% for package in debian_live_build_common_packages %} +{% for package in live_build_common_packages %} {{ package }} {% endfor %} diff --git a/templates/custom.list.chroot.j2 b/templates/custom.list.chroot.j2 index f334167..44a77ff 100644 --- a/templates/custom.list.chroot.j2 +++ b/templates/custom.list.chroot.j2 @@ -1,3 +1,3 @@ -{% for package in debian_live_build_custom_packages %} +{% for package in live_build_custom_packages %} {{ package }} {% endfor %} diff --git a/templates/isolinux.cfg.j2 b/templates/isolinux.cfg.j2 index 6a41761..02adfad 100644 --- a/templates/isolinux.cfg.j2 +++ b/templates/isolinux.cfg.j2 @@ -1,5 +1,5 @@ include live.cfg default live-amd64 -{% if debian_live_build_serial_console == true %} +{% if live_build_serial_console == true %} serial 0 {% endif %} diff --git a/templates/lb-config-args.j2 b/templates/lb-config-args.j2 index e68c123..03fb497 100644 --- a/templates/lb-config-args.j2 +++ b/templates/lb-config-args.j2 @@ -1,13 +1,13 @@ -{% if debian_live_build_distribution is defined %} ---distribution "{{ debian_live_build_distribution }}" +{% if live_build_distribution is defined %} +--distribution "{{ live_build_distribution }}" {% endif %} -{% if debian_live_build_archive_areas is defined %} ---archive-areas "{{ debian_live_build_archive_areas | join(' ') }}" +{% if live_build_archive_areas is defined %} +--archive-areas "{{ live_build_archive_areas | join(' ') }}" {% endif %} --mirror-bootstrap {{ debian_mirror }} --mirror-binary {{ debian_mirror }} -{% if debian_live_build_bootappend_live is defined %} ---bootappend-live "{{ debian_live_build_bootappend_live }}" +{% if live_build_bootappend_live is defined %} +--bootappend-live "{{ live_build_bootappend_live }}" {% endif %} {% if debian_live_debian_installer is defined %} --debian-installer "{{ debian_live_debian_installer }}" diff --git a/vars/main.yml b/vars/main.yml index 4cfe32b..a11c893 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,4 +1,4 @@ -debian_live_build_common_packages: +live_build_common_packages: - openssh-server - python - console-setup