gekmihesg · bcoca · Nov 21, 2023
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-Ansible Role: openwrt
-=====================
+Ansible Collection: gekmihesg.openwrt
+=====================================
 
 Manage OpenWRT and derivatives with Ansible but without Python.
 
@@ -26,18 +26,12 @@ Currently, the following modules have been implemented:
  * uci (new)
  * wait\_for\_connection (implicit)
 
+# TODO: enable in play with ``collections: [gekmihesg.openwrt]``, reduce need for monkey patch
 To achieve all this, some monkey patching is involved (in case you wonder about the `vars_plugins`).
 
 Compatibility
 -------------
 
-This role was tested successfully with:
- * LEDE 17.01 (manually)
- * OpenWRT 18.06
- * OpenWRT 19.07
- * OpenWRT 21.02
- * OpenWRT 22.03
-
 Requirements
 ------------
 

diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml
@@ -0,0 +1,14 @@
+- hosts: openwrt
+  gather_facts: false
+  vars_prompt:
+    - name: openwrt_install_recommended_packages
+      default: true
+    - name: openwrt_wait_for_connection
+      default: true
+    - name: openwrt_wait_for_connection_timeout
+      default: 600
+  roles:
+    - prep
+  tasks:
+    - name: Ensure we have working setup by using custom fact gathering
+      gather_facts:
diff --git a/defaults/main.yml → playbooks/group_vars/openwrt.yml b/defaults/main.yml → playbooks/group_vars/openwrt.yml
@@ -1,6 +1,7 @@
 ---
-openwrt_install_recommended_packages: true
+# group_vars for openwrt group
 
+openwrt_install_recommended_packages: true
 openwrt_wait_for_connection: true
 openwrt_wait_for_connection_timeout: 600
 
@@ -15,3 +16,5 @@ openwrt_ssh_use_tty: false
 openwrt_remote_tmp: /tmp
 
 openwrt_remote_opkg_lists_dir: /tmp/opkg-lists
+
+ansible_facts_modules: gekmihesg.openwrt.setup
diff --git a/library/openwrt_command.sh → plugins/modules/command.sh b/library/openwrt_command.sh → plugins/modules/command.sh
diff --git a/library/openwrt_copy.sh → plugins/modules/copy.sh b/library/openwrt_copy.sh → plugins/modules/copy.sh
diff --git a/library/openwrt_file.sh → plugins/modules/file.sh b/library/openwrt_file.sh → plugins/modules/file.sh
diff --git a/library/openwrt_lineinfile.sh → plugins/modules/lineinfile.sh b/library/openwrt_lineinfile.sh → plugins/modules/lineinfile.sh
diff --git a/library/nohup.py → plugins/modules/nohup.py b/library/nohup.py → plugins/modules/nohup.py
diff --git a/library/openwrt_nohup.sh → plugins/modules/nohup.sh b/library/openwrt_nohup.sh → plugins/modules/nohup.sh
diff --git a/library/openwrt_opkg.sh → plugins/modules/opkg.sh b/library/openwrt_opkg.sh → plugins/modules/opkg.sh
diff --git a/library/openwrt_ping.sh → plugins/modules/ping.sh b/library/openwrt_ping.sh → plugins/modules/ping.sh
diff --git a/library/openwrt_service.sh → plugins/modules/service.sh b/library/openwrt_service.sh → plugins/modules/service.sh
diff --git a/library/openwrt_setup.sh → plugins/modules/setup.sh b/library/openwrt_setup.sh → plugins/modules/setup.sh
diff --git a/library/openwrt_slurp.sh → plugins/modules/slurp.sh b/library/openwrt_slurp.sh → plugins/modules/slurp.sh
diff --git a/library/openwrt_stat.sh → plugins/modules/stat.sh b/library/openwrt_stat.sh → plugins/modules/stat.sh
diff --git a/library/openwrt_sysctl.sh → plugins/modules/sysctl.sh b/library/openwrt_sysctl.sh → plugins/modules/sysctl.sh
diff --git a/library/uci.py → plugins/modules/uci.py b/library/uci.py → plugins/modules/uci.py
diff --git a/library/openwrt_uci.sh → plugins/modules/uci.sh b/library/openwrt_uci.sh → plugins/modules/uci.sh
diff --git a/vars_plugins/monkeypatch.py → plugins/vars/monkeypatch.py b/vars_plugins/monkeypatch.py → plugins/vars/monkeypatch.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +0,0 @@
-molecule[docker,lint]
-docker
-yamllint
-ansible-lint

diff --git a/handlers/main.yml → roles/pkg/handlers/main.yml b/handlers/main.yml → roles/pkg/handlers/main.yml
diff --git a/tasks/package.yml → roles/pkg/tasks/main.yml b/tasks/package.yml → roles/pkg/tasks/main.yml
diff --git a/tasks/packages.yml → roles/pkg/tasks/recommended.yml b/tasks/packages.yml → roles/pkg/tasks/recommended.yml
@@ -28,7 +28,7 @@
   changed_when: false
   failed_when: false
 
-- include_tasks: package.yml
+- include_tasks: main.yml
   with_dict:
     base64: coreutils-base64
     md5sum: coreutils-md5sum

diff --git a/files/wrapper.sh → roles/prep/files/wrapper.sh b/files/wrapper.sh → roles/prep/files/wrapper.sh
diff --git a/tasks/main.yml → roles/prep/tasks/main.yml b/tasks/main.yml → roles/prep/tasks/main.yml
@@ -14,7 +14,9 @@
   tags: always
 
 - name: install recommended packages
-  include_tasks: packages.yml
+  include_role:
+    name: pkg
+    tasks_from: recommended
   when:
     - "'openwrt' in group_names"
     - "openwrt_install_recommended_packages | bool"