Skip to content

Commit 74cd43d

Browse files
committed
WIP
1 parent 6e3c0af commit 74cd43d

File tree

2 files changed

+33
-13
lines changed

2 files changed

+33
-13
lines changed

group_vars/all/imageprofile.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ imagebuilder: >
99
https://downloads.cdn.openwrt.org/{{
1010
'snapshots' if openwrt_version == 'snapshot' else 'releases/' ~ openwrt_version
1111
}}/targets/{{ target }}/{{ imagebuilder_filename }}
12+
instr_set: TODO
1213
feed: "src/gz openwrt_falter https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/{{ instr_set }}/falter"
1314

1415
# The packages list is spread over a number of lists for two reasons:

roles/cfg_openwrt/tasks/main.yml

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,50 @@
11
---
2+
3+
- name: Prepare directories variables
4+
set_fact:
5+
configs_dir: "{{ playbook_dir }}/tmp/configs/{{ inventory_hostname }}"
6+
dl_dir: "{{ playbook_dir }}/tmp/dl"
7+
build_dir: "{{ playbook_dir }}/tmp/build/{{ inventory_hostname }}"
8+
images_dir: "{{ playbook_dir }}/tmp/images"
9+
wikiupdater_dir: "{{ playbook_dir }}/tmp/wikiupdater"
10+
tags: always
11+
12+
- name: Create directories
13+
file:
14+
path: "{{ item }}"
15+
state: directory
16+
mode: "755"
17+
tags: always
18+
loop:
19+
- "{{ configs_dir }}"
20+
- "{{ dl_dir }}"
21+
- "{{ build_dir }}"
22+
- "{{ images_dir }}"
23+
- "{{ wikiupdater_dir }}"
24+
225
- name: Include tasks for conditional packages
326
include_tasks:
427
file: conditional_packages.yml
528
apply:
629
tags: always
730
tags: always
831

32+
- name: Debug hostvars before merge_vars
33+
copy:
34+
dest: "{{ images_dir }}/{{ inventory_hostname }}.early.json"
35+
content: "{{ hostvars[inventory_hostname] | rejectattr('key','matches','__to_merge') to_json(indent=2) }}"
36+
937
- name: Include tasks for merging variables
1038
include_tasks:
1139
file: merge_vars.yml
1240
apply:
1341
tags: always
1442
tags: always
1543

16-
- name: Prepare some variables (1)
17-
set_fact:
18-
basedir: "{{ playbook_dir }}/tmp"
19-
tags: always
20-
21-
- name: Prepare some variables
22-
set_fact:
23-
configs_dir: "{{ basedir }}/configs/{{ inventory_hostname }}"
24-
dl_dir: "{{ basedir }}/dl/"
25-
build_dir: "{{ basedir }}/build/{{ inventory_hostname }}"
26-
images_dir: "{{ basedir }}/images/"
27-
wikiupdater_dir: "{{ basedir }}/wikiupdater/"
28-
tags: always
44+
- name: Debug hostvars after merge_vars
45+
copy:
46+
dest: "{{ images_dir }}/{{ inventory_hostname }}.final.json"
47+
content: "{{ hostvars[inventory_hostname] | to_json(indent=2) }}"
2948

3049
- name: Create directory
3150
file:

0 commit comments

Comments
 (0)