move raspios and openwrt folders to installer/

30 files changed, 12 insertions, 16 deletions

diff --git a/_graveyard_/dan/ele-dolmetsch-ctl.yml b/_graveyard_/dan/ele-dolmetsch-ctl.yml
index c9d47ea8..ddc7aebd 100644
--- a/_graveyard_/dan/ele-dolmetsch-ctl.yml
+++ b/_graveyard_/dan/ele-dolmetsch-ctl.yml
@@ -3,6 +3,5 @@
   hosts: ele-dolmetsch-ctl
   connection: local
   gather_facts: no
-
   roles:
-  - role: openwrt/image
+  - role: installer/openwrt/image
diff --git a/roles/slim/hetzner/tasks/main.yml b/_graveyard_/roles/slim/hetzner/tasks/main.yml
index a44ccdb5..a44ccdb5 100644
--- a/roles/slim/hetzner/tasks/main.yml
+++ b/_graveyard_/roles/slim/hetzner/tasks/main.yml
diff --git a/roles/slim/scaleway/tasks/main.yml b/_graveyard_/roles/slim/scaleway/tasks/main.yml
index a44ccdb5..a44ccdb5 100644
--- a/roles/slim/scaleway/tasks/main.yml
+++ b/_graveyard_/roles/slim/scaleway/tasks/main.yml
diff --git a/chaos-at-home/image-generate.yml b/chaos-at-home/image-generate.yml
index 4c2f5fb9..1b11f1eb 100644
--- a/chaos-at-home/image-generate.yml
+++ b/chaos-at-home/image-generate.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   roles:
-  - role: "{{ install_distro }}/image"
+  - role: "installer/{{ install_distro }}/image"
   post_tasks:
   - pause:
       seconds: 0
diff --git a/chaos-at-home/mz-ap.yml b/chaos-at-home/mz-ap.yml
index 869f051d..46b0aa88 100644
--- a/chaos-at-home/mz-ap.yml
+++ b/chaos-at-home/mz-ap.yml
@@ -3,6 +3,5 @@
   hosts: mz-ap
   connection: local
   gather_facts: no
-
   roles:
-  - role: openwrt/image
+  - role: installer/openwrt/image
diff --git a/chaos-at-home/mz-router.yml b/chaos-at-home/mz-router.yml
index 94646991..8f4f056f 100644
--- a/chaos-at-home/mz-router.yml
+++ b/chaos-at-home/mz-router.yml
@@ -3,10 +3,8 @@
   hosts: mz-router
   connection: local
   gather_facts: no
-
   roles:
-  - role: openwrt/image
-
+  - role: installer/openwrt/image
   post_tasks:
   - pause:
       prompt: "\n******  copy and install image onto router and wait for it to come back ******\n"
diff --git a/chaos-at-home/openwrt-deploy.yml b/chaos-at-home/openwrt-deploy.yml
index 2832d6ed..e7cc49fa 100644
--- a/chaos-at-home/openwrt-deploy.yml
+++ b/chaos-at-home/openwrt-deploy.yml
@@ -4,6 +4,6 @@
   connection: local
   gather_facts: no
   roles:
-  - role: openwrt/image
+  - role: installer/openwrt/image
 
 - import_playbook: ../common/openwrt-deploy.yml
diff --git a/chaos-at-home/vm-deploy.yml b/chaos-at-home/vm-deploy.yml
index 33268b6d..8530b14a 100644
--- a/chaos-at-home/vm-deploy.yml
+++ b/chaos-at-home/vm-deploy.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   roles:
-  - role: "{{ install_distro }}/image"
+  - role: "installer/{{ install_distro }}/image"
 
 - name: cook variables for host
   hosts: "{{ install_hostname }}"
diff --git a/dan/image-generate.yml b/dan/image-generate.yml
index 4c2f5fb9..1b11f1eb 100644
--- a/dan/image-generate.yml
+++ b/dan/image-generate.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   roles:
-  - role: "{{ install_distro }}/image"
+  - role: "installer/{{ install_distro }}/image"
   post_tasks:
   - pause:
       seconds: 0
diff --git a/dan/openwrt-deploy.yml b/dan/openwrt-deploy.yml
index 2832d6ed..e7cc49fa 100644
--- a/dan/openwrt-deploy.yml
+++ b/dan/openwrt-deploy.yml
@@ -4,6 +4,6 @@
   connection: local
   gather_facts: no
   roles:
-  - role: openwrt/image
+  - role: installer/openwrt/image
 
 - import_playbook: ../common/openwrt-deploy.yml
diff --git a/dan/vm-deploy.yml b/dan/vm-deploy.yml
index 33268b6d..8530b14a 100644
--- a/dan/vm-deploy.yml
+++ b/dan/vm-deploy.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   roles:
-  - role: "{{ install_distro }}/image"
+  - role: "installer/{{ install_distro }}/image"
 
 - name: cook variables for host
   hosts: "{{ install_hostname }}"
diff --git a/roles/openwrt/deploy/action_plugins/openwrt_sysupgrade.py b/roles/installer/openwrt/deploy/action_plugins/openwrt_sysupgrade.py
index 16772937..16772937 100644
--- a/roles/openwrt/deploy/action_plugins/openwrt_sysupgrade.py
+++ b/roles/installer/openwrt/deploy/action_plugins/openwrt_sysupgrade.py
diff --git a/roles/openwrt/deploy/tasks/main.yml b/roles/installer/openwrt/deploy/tasks/main.yml
index 06fb28ad..06fb28ad 100644
--- a/roles/openwrt/deploy/tasks/main.yml
+++ b/roles/installer/openwrt/deploy/tasks/main.yml
diff --git a/roles/openwrt/image/README.md b/roles/installer/openwrt/image/README.md
index 95d9d106..95d9d106 100644
--- a/roles/openwrt/image/README.md
+++ b/roles/installer/openwrt/image/README.md
diff --git a/roles/openwrt/image/defaults/main.yml b/roles/installer/openwrt/image/defaults/main.yml
index 9f867053..9f867053 100644
--- a/roles/openwrt/image/defaults/main.yml
+++ b/roles/installer/openwrt/image/defaults/main.yml
diff --git a/roles/openwrt/image/tasks/fetch.yml b/roles/installer/openwrt/image/tasks/fetch.yml
index 1dc5728d..1dc5728d 100644
--- a/roles/openwrt/image/tasks/fetch.yml
+++ b/roles/installer/openwrt/image/tasks/fetch.yml
diff --git a/roles/openwrt/image/tasks/main.yml b/roles/installer/openwrt/image/tasks/main.yml
index 5bf07d04..5bf07d04 100644
--- a/roles/openwrt/image/tasks/main.yml
+++ b/roles/installer/openwrt/image/tasks/main.yml
diff --git a/roles/openwrt/image/tasks/prepare.yml b/roles/installer/openwrt/image/tasks/prepare.yml
index f685540c..f685540c 100644
--- a/roles/openwrt/image/tasks/prepare.yml
+++ b/roles/installer/openwrt/image/tasks/prepare.yml
diff --git a/roles/openwrt/image/templates/group.j2 b/roles/installer/openwrt/image/templates/group.j2
index cb433b88..cb433b88 100644
--- a/roles/openwrt/image/templates/group.j2
+++ b/roles/installer/openwrt/image/templates/group.j2
diff --git a/roles/openwrt/image/templates/passwd.j2 b/roles/installer/openwrt/image/templates/passwd.j2
index 9beaeb61..9beaeb61 100644
--- a/roles/openwrt/image/templates/passwd.j2
+++ b/roles/installer/openwrt/image/templates/passwd.j2
diff --git a/roles/openwrt/image/templates/uci.j2 b/roles/installer/openwrt/image/templates/uci.j2
index 3cc480b2..3cc480b2 100644
--- a/roles/openwrt/image/templates/uci.j2
+++ b/roles/installer/openwrt/image/templates/uci.j2
diff --git a/roles/raspios/image/defaults/main.yml b/roles/installer/raspios/image/defaults/main.yml
index 3f6ab3a3..3f6ab3a3 100644
--- a/roles/raspios/image/defaults/main.yml
+++ b/roles/installer/raspios/image/defaults/main.yml
diff --git a/roles/raspios/image/filter_plugins/main.py b/roles/installer/raspios/image/filter_plugins/main.py
index 5ac2d5ab..5ac2d5ab 100644
--- a/roles/raspios/image/filter_plugins/main.py
+++ b/roles/installer/raspios/image/filter_plugins/main.py
diff --git a/roles/raspios/image/tasks/fetch.yml b/roles/installer/raspios/image/tasks/fetch.yml
index bbde6bdf..bbde6bdf 100644
--- a/roles/raspios/image/tasks/fetch.yml
+++ b/roles/installer/raspios/image/tasks/fetch.yml
diff --git a/roles/raspios/image/tasks/main.yml b/roles/installer/raspios/image/tasks/main.yml
index b8296f9a..b8296f9a 100644
--- a/roles/raspios/image/tasks/main.yml
+++ b/roles/installer/raspios/image/tasks/main.yml
diff --git a/roles/raspios/image/templates/firstrun.sh.j2 b/roles/installer/raspios/image/templates/firstrun.sh.j2
index bc35b764..bc35b764 100644
--- a/roles/raspios/image/templates/firstrun.sh.j2
+++ b/roles/installer/raspios/image/templates/firstrun.sh.j2
diff --git a/roles/raspios/image/vars/main.yml b/roles/installer/raspios/image/vars/main.yml
index 7c547ce2..7c547ce2 100644
--- a/roles/raspios/image/vars/main.yml
+++ b/roles/installer/raspios/image/vars/main.yml
diff --git a/spreadspace/image-generate.yml b/spreadspace/image-generate.yml
index 4c2f5fb9..1b11f1eb 100644
--- a/spreadspace/image-generate.yml
+++ b/spreadspace/image-generate.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   roles:
-  - role: "{{ install_distro }}/image"
+  - role: "installer/{{ install_distro }}/image"
   post_tasks:
   - pause:
       seconds: 0
diff --git a/spreadspace/openwrt-deploy.yml b/spreadspace/openwrt-deploy.yml
index 2832d6ed..e7cc49fa 100644
--- a/spreadspace/openwrt-deploy.yml
+++ b/spreadspace/openwrt-deploy.yml
@@ -4,6 +4,6 @@
   connection: local
   gather_facts: no
   roles:
-  - role: openwrt/image
+  - role: installer/openwrt/image
 
 - import_playbook: ../common/openwrt-deploy.yml
diff --git a/spreadspace/vm-deploy.yml b/spreadspace/vm-deploy.yml
index 33268b6d..8530b14a 100644
--- a/spreadspace/vm-deploy.yml
+++ b/spreadspace/vm-deploy.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: no
   roles:
-  - role: "{{ install_distro }}/image"
+  - role: "installer/{{ install_distro }}/image"
 
 - name: cook variables for host
   hosts: "{{ install_hostname }}"