From c4ca19535834be8afbb507036ab988145c9858d8 Mon Sep 17 00:00:00 2001 From: jalr Date: Thu, 18 Oct 2018 21:54:27 +0200 Subject: [PATCH 1/4] Move tags to main.yml files in roles --- packer/ansible/playbook.yml | 20 --------- packer/ansible/roles/auth/tasks/main.yml | 11 ++++- packer/ansible/roles/docker/tasks/main.yml | 14 +++--- packer/ansible/roles/fablab/tasks/main.yml | 43 ++++++++++--------- packer/ansible/roles/hardware/tasks/main.yml | 7 ++- packer/ansible/roles/inkscape/tasks/main.yml | 7 ++- packer/ansible/roles/l10n/tasks/main.yml | 15 +++++-- packer/ansible/roles/labsync/tasks/main.yml | 13 +++--- .../roles/network-manager/tasks/main.yml | 17 +++++--- packer/ansible/roles/packages/tasks/main.yml | 7 ++- packer/ansible/roles/superuser/tasks/main.yml | 23 +++++----- .../roles/windowmanager/tasks/main.yml | 19 ++++---- 12 files changed, 111 insertions(+), 85 deletions(-) diff --git a/packer/ansible/playbook.yml b/packer/ansible/playbook.yml index 8b6c739..3d79463 100644 --- a/packer/ansible/playbook.yml +++ b/packer/ansible/playbook.yml @@ -3,35 +3,15 @@ any_errors_fatal: yes roles: - role: packages - tags: - - packages - role: superuser - tags: - - superuser - role: auth - tags: - - auth - role: labsync - tags: - - labsync - role: windowmanager - tags: - - windowmanager - role: l10n - tags: - - l10n - role: inkscape - tags: - - inkscape - role: fablab - tags: - - fablab - role: hardware - tags: - - hardware - role: docker - tags: - - docker vars: auth: sudo: diff --git a/packer/ansible/roles/auth/tasks/main.yml b/packer/ansible/roles/auth/tasks/main.yml index e13fe8d..aef03de 100644 --- a/packer/ansible/roles/auth/tasks/main.yml +++ b/packer/ansible/roles/auth/tasks/main.yml @@ -1,3 +1,10 @@ --- -- import_tasks: debug.yml -- import_tasks: sudo.yml +- block: + - import_tasks: debug.yml + tags: + - auth:debug + - import_tasks: sudo.yml + tags: + - auth:sudo + tags: + - auth diff --git a/packer/ansible/roles/docker/tasks/main.yml b/packer/ansible/roles/docker/tasks/main.yml index f9b4a60..1b11c3d 100644 --- a/packer/ansible/roles/docker/tasks/main.yml +++ b/packer/ansible/roles/docker/tasks/main.yml @@ -1,8 +1,10 @@ --- -- import_tasks: packages.yml +- block: + - import_tasks: packages.yml + tags: + - docker:packages + - import_tasks: lvm-setup-service.yml + tags: + - docker:lvm-setup-service tags: - - docker:packages - -- import_tasks: lvm-setup-service.yml - tags: - - docker:lvm-setup-service + - docker diff --git a/packer/ansible/roles/fablab/tasks/main.yml b/packer/ansible/roles/fablab/tasks/main.yml index d8e8d8b..3e50409 100644 --- a/packer/ansible/roles/fablab/tasks/main.yml +++ b/packer/ansible/roles/fablab/tasks/main.yml @@ -1,22 +1,25 @@ --- -- import_tasks: arduino.yml +- block: + - import_tasks: arduino.yml + tags: + - fablab:arduino + - import_tasks: cad.yml + tags: + - fablab:cad + - import_tasks: cura.yml + tags: + - fablab:cura + - import_tasks: fritzing.yml + tags: + - fablab:fritzing + - import_tasks: kicad.yml + tags: + - fablab:kicad + - import_tasks: visicut.yml + tags: + - fablab:visicut + - import_tasks: metalcut.yml + tags: + - fablab:metalcut tags: - - fablab:arduino -- import_tasks: cad.yml - tags: - - fablab:cad -- import_tasks: cura.yml - tags: - - fablab:cura -- import_tasks: fritzing.yml - tags: - - fablab:fritzing -- import_tasks: kicad.yml - tags: - - fablab:kicad -- import_tasks: visicut.yml - tags: - - fablab:visicut -- import_tasks: metalcut.yml - tags: - - fablab:metalcut + - fablab diff --git a/packer/ansible/roles/hardware/tasks/main.yml b/packer/ansible/roles/hardware/tasks/main.yml index e269158..fe30078 100644 --- a/packer/ansible/roles/hardware/tasks/main.yml +++ b/packer/ansible/roles/hardware/tasks/main.yml @@ -1,2 +1,7 @@ --- -- import_tasks: firmware.yml +- block: + - import_tasks: firmware.yml + tags: + - hardware:firmware + tags: + - hardware diff --git a/packer/ansible/roles/inkscape/tasks/main.yml b/packer/ansible/roles/inkscape/tasks/main.yml index a9374b6..a89d170 100644 --- a/packer/ansible/roles/inkscape/tasks/main.yml +++ b/packer/ansible/roles/inkscape/tasks/main.yml @@ -1,2 +1,7 @@ --- -- import_tasks: base.yml +- block: + - import_tasks: base.yml + tags: + - inkscape:base + tags: + - inkscape diff --git a/packer/ansible/roles/l10n/tasks/main.yml b/packer/ansible/roles/l10n/tasks/main.yml index d55a754..71f9f99 100644 --- a/packer/ansible/roles/l10n/tasks/main.yml +++ b/packer/ansible/roles/l10n/tasks/main.yml @@ -1,4 +1,13 @@ --- -- import_tasks: keyboard-configuration.yml -- import_tasks: locale.yml -- import_tasks: timezone.yml +- block: + - import_tasks: keyboard-configuration.yml + tags: + - l10n:keyboard-configuration + - import_tasks: locale.yml + tags: + - l10n:locale + - import_tasks: timezone.yml + tags: + - l10n:timezone + tags: + - l10n diff --git a/packer/ansible/roles/labsync/tasks/main.yml b/packer/ansible/roles/labsync/tasks/main.yml index 5520f9a..6d57c2d 100644 --- a/packer/ansible/roles/labsync/tasks/main.yml +++ b/packer/ansible/roles/labsync/tasks/main.yml @@ -1,7 +1,10 @@ --- -- import_tasks: seeder.yml +- block: + - import_tasks: seeder.yml + tags: + - labsync:seeder + - import_tasks: localboot.yml + tags: + - labsync:localboot tags: - - labsync:seeder -- import_tasks: localboot.yml - tags: - - labsync:localboot + - labsync diff --git a/packer/ansible/roles/network-manager/tasks/main.yml b/packer/ansible/roles/network-manager/tasks/main.yml index d7ced84..65a6e73 100644 --- a/packer/ansible/roles/network-manager/tasks/main.yml +++ b/packer/ansible/roles/network-manager/tasks/main.yml @@ -1,8 +1,11 @@ --- -- name: install network-manager - apt: - name: "{{ item }}" - state: present - with_items: - - network-manager - - network-manager-gnome +- block: + - name: install network-manager + apt: + name: "{{ item }}" + state: present + with_items: + - network-manager + - network-manager-gnome +tags: + - network-manager diff --git a/packer/ansible/roles/packages/tasks/main.yml b/packer/ansible/roles/packages/tasks/main.yml index 721c6b9..a9a9168 100644 --- a/packer/ansible/roles/packages/tasks/main.yml +++ b/packer/ansible/roles/packages/tasks/main.yml @@ -1,3 +1,6 @@ --- -- import_tasks: sources.yml -- import_tasks: debian.yml +- block: + - import_tasks: sources.yml + - import_tasks: debian.yml + tags: + - packages diff --git a/packer/ansible/roles/superuser/tasks/main.yml b/packer/ansible/roles/superuser/tasks/main.yml index 2b8fa14..4ac2f99 100644 --- a/packer/ansible/roles/superuser/tasks/main.yml +++ b/packer/ansible/roles/superuser/tasks/main.yml @@ -1,11 +1,14 @@ -- name: create root .ssh directory - file: - path: /root/.ssh - owner: root - group: root - state: directory +- block: + - name: create root .ssh directory + file: + path: /root/.ssh + owner: root + group: root + state: directory -- name: set authorized keys for root user - copy: - src: files/authorized_keys - dest: /root/.ssh/authorized_keys + - name: set authorized keys for root user + copy: + src: files/authorized_keys + dest: /root/.ssh/authorized_keys + tags: + - superuser diff --git a/packer/ansible/roles/windowmanager/tasks/main.yml b/packer/ansible/roles/windowmanager/tasks/main.yml index be2cb0a..5761966 100644 --- a/packer/ansible/roles/windowmanager/tasks/main.yml +++ b/packer/ansible/roles/windowmanager/tasks/main.yml @@ -1,10 +1,13 @@ --- -- import_tasks: lightdm.yml +- block: + - import_tasks: lightdm.yml + tags: + - windowmanager:lightdm + - import_tasks: awesome.yml + tags: + - windowmanager:awesome + - import_tasks: mate.yml + tags: + - windowmanager:mate tags: - - windowmanager:lightdm -- import_tasks: awesome.yml - tags: - - windowmanager:awesome -- import_tasks: mate.yml - tags: - - windowmanager:mate + - windowmanager -- 2.51.2 From 9f98642da0d18326de313bef829e66d088c5870a Mon Sep 17 00:00:00 2001 From: jalr Date: Thu, 18 Oct 2018 21:59:50 +0200 Subject: [PATCH 2/4] Add inkscape-silhouette --- .gitmodules | 3 +++ .../roles/inkscape/files/inkscape-silhouette | 1 + packer/ansible/roles/inkscape/tasks/main.yml | 3 +++ .../ansible/roles/inkscape/tasks/silhouette.yml | 17 +++++++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 .gitmodules create mode 160000 packer/ansible/roles/inkscape/files/inkscape-silhouette create mode 100644 packer/ansible/roles/inkscape/tasks/silhouette.yml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1c26fa2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "packer/ansible/roles/inkscape/files/inkscape-silhouette"] + path = packer/ansible/roles/inkscape/files/inkscape-silhouette + url = https://github.com/fablab-nea/inkscape-silhouette diff --git a/packer/ansible/roles/inkscape/files/inkscape-silhouette b/packer/ansible/roles/inkscape/files/inkscape-silhouette new file mode 160000 index 0000000..6b1d818 --- /dev/null +++ b/packer/ansible/roles/inkscape/files/inkscape-silhouette @@ -0,0 +1 @@ +Subproject commit 6b1d81884cd2df50ee78a248b8c3a219695bd38c diff --git a/packer/ansible/roles/inkscape/tasks/main.yml b/packer/ansible/roles/inkscape/tasks/main.yml index a89d170..842910d 100644 --- a/packer/ansible/roles/inkscape/tasks/main.yml +++ b/packer/ansible/roles/inkscape/tasks/main.yml @@ -3,5 +3,8 @@ - import_tasks: base.yml tags: - inkscape:base + - import_tasks: silhouette.yml + tags: + - inkscape:silhouette tags: - inkscape diff --git a/packer/ansible/roles/inkscape/tasks/silhouette.yml b/packer/ansible/roles/inkscape/tasks/silhouette.yml new file mode 100644 index 0000000..c6de75c --- /dev/null +++ b/packer/ansible/roles/inkscape/tasks/silhouette.yml @@ -0,0 +1,17 @@ +--- +- name: install python-usb + package: + name: python-usb + state: present + +- name: copy files + copy: + src: inkscape-silhouette/{{ item }} + dest: /usr/share/inkscape/extensions + owner: root + group: root + mode: "0644" + loop: + - sendto_silhouette.inx + - sendto_silhouette.py + - silhouette -- 2.51.2 From aa6b0217877cd60c67e79a1853ee94b46e35841a Mon Sep 17 00:00:00 2001 From: jalr Date: Fri, 19 Oct 2018 16:36:41 +0200 Subject: [PATCH 3/4] Update ansible 2.4.3.0->2.7.0 --- builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Dockerfile b/builder/Dockerfile index 51f3419..02627a5 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -18,7 +18,7 @@ RUN apk add --no-cache \ py2-pip \ python-dev \ && pip install --upgrade pip \ - && pip install ansible==2.4.3.0 \ + && pip install ansible==2.7.0 \ && apk del .build-deps ARG PACKER_VERSION -- 2.51.2 From a2af88f01e0c484027fd93481da8e789ef5fec48 Mon Sep 17 00:00:00 2001 From: jalr Date: Fri, 19 Oct 2018 16:53:11 +0200 Subject: [PATCH 4/4] recursively git clone in CI --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88b4524..f0f2c94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: docker:latest variables: GIT_STRATEGY: fetch + GIT_SUBMODULE_STRATEGY: recursive PACKER_VERSION: 1.2.0 ANNOUNCE: http://labsync.lab.fablab-nea.de:6969/announce WEBSEED: http://labsync.lab.fablab-nea.de/labsync/$CI_COMMIT_REF_NAME/$CI_PIPELINE_ID/images -- 2.51.2