diff --git a/main.yml b/main.yml index c1d1837..2bf4a79 100644 --- a/main.yml +++ b/main.yml @@ -1,10 +1,7 @@ --- -# Common +# Common node configuration, run via ansible-pull. - name: Common Node Configuration hosts: all become: true - vars_files: - - group_vars/vars.yml roles: - - role: base_packages - - role: example_config + - role: common diff --git a/roles/defaults/main.yml b/roles/common/defaults/main.yml similarity index 98% rename from roles/defaults/main.yml rename to roles/common/defaults/main.yml index 9738ee3..b1f229d 100644 --- a/roles/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -1,3 +1,4 @@ +--- ### Signalytic Directories ### default_user: "signalytic" diff --git a/roles/packages/cellmodem-scripts-v15.tar.bz2 b/roles/common/files/cellmodem-scripts-v15.tar.bz2 similarity index 100% rename from roles/packages/cellmodem-scripts-v15.tar.bz2 rename to roles/common/files/cellmodem-scripts-v15.tar.bz2 diff --git a/roles/packages/power-management-v11.tar.bz2 b/roles/common/files/power-management-v11.tar.bz2 similarity index 100% rename from roles/packages/power-management-v11.tar.bz2 rename to roles/common/files/power-management-v11.tar.bz2 diff --git a/roles/packages/signalytic-ap-manager-5.v5.tar.bz2 b/roles/common/files/signalytic-ap-manager-5.v5.tar.bz2 similarity index 100% rename from roles/packages/signalytic-ap-manager-5.v5.tar.bz2 rename to roles/common/files/signalytic-ap-manager-5.v5.tar.bz2 diff --git a/roles/packages/signalytic-battery-manager_3.0_all.deb b/roles/common/files/signalytic-battery-manager_3.0_all.deb similarity index 100% rename from roles/packages/signalytic-battery-manager_3.0_all.deb rename to roles/common/files/signalytic-battery-manager_3.0_all.deb diff --git a/roles/packages/signalytic-network-manager-1.1.v1-1_all.deb b/roles/common/files/signalytic-network-manager-1.1.v1-1_all.deb similarity index 100% rename from roles/packages/signalytic-network-manager-1.1.v1-1_all.deb rename to roles/common/files/signalytic-network-manager-1.1.v1-1_all.deb diff --git a/roles/scripts/install-k3s.sh b/roles/common/scripts/install-k3s.sh similarity index 100% rename from roles/scripts/install-k3s.sh rename to roles/common/scripts/install-k3s.sh diff --git a/roles/tasks/create-dirs.yml b/roles/common/tasks/create-dirs.yml similarity index 98% rename from roles/tasks/create-dirs.yml rename to roles/common/tasks/create-dirs.yml index 60f3ad9..a165877 100644 --- a/roles/tasks/create-dirs.yml +++ b/roles/common/tasks/create-dirs.yml @@ -1,3 +1,4 @@ +--- - name: Check signalytic directories exist ansible.builtin.file: path: "{{ item }}" diff --git a/roles/tasks/install-cellmodem-package.yml b/roles/common/tasks/install-cellmodem-package.yml similarity index 94% rename from roles/tasks/install-cellmodem-package.yml rename to roles/common/tasks/install-cellmodem-package.yml index 97b9136..70f54e3 100644 --- a/roles/tasks/install-cellmodem-package.yml +++ b/roles/common/tasks/install-cellmodem-package.yml @@ -1,6 +1,7 @@ +--- - name: Extract cellmodem package ansible.builtin.unarchive: - src: packages/cellmodem-scripts-v15.tar.bz2 + src: files/cellmodem-scripts-v15.tar.bz2 dest: /tmp remote_src: false become: true diff --git a/roles/tasks/install-power-management.yml b/roles/common/tasks/install-power-management.yml similarity index 94% rename from roles/tasks/install-power-management.yml rename to roles/common/tasks/install-power-management.yml index 22ba78d..032126b 100644 --- a/roles/tasks/install-power-management.yml +++ b/roles/common/tasks/install-power-management.yml @@ -1,6 +1,7 @@ +--- - name: Extract power-management package ansible.builtin.unarchive: - src: packages/power-management-v11.tar.bz2 + src: files/power-management-v11.tar.bz2 dest: /tmp remote_src: false become: true diff --git a/roles/tasks/install-signalytic-ap.yml b/roles/common/tasks/install-signalytic-ap.yml similarity index 93% rename from roles/tasks/install-signalytic-ap.yml rename to roles/common/tasks/install-signalytic-ap.yml index eea2481..3470ddf 100644 --- a/roles/tasks/install-signalytic-ap.yml +++ b/roles/common/tasks/install-signalytic-ap.yml @@ -1,6 +1,7 @@ +--- - name: Extract signalytic-ap package ansible.builtin.unarchive: - src: packages/signalytic-ap-manager-5.v5.tar.bz2 + src: files/signalytic-ap-manager-5.v5.tar.bz2 dest: /tmp remote_src: false become: true diff --git a/roles/tasks/install-signalytic-deb.yml b/roles/common/tasks/install-signalytic-deb.yml similarity index 68% rename from roles/tasks/install-signalytic-deb.yml rename to roles/common/tasks/install-signalytic-deb.yml index 12ddfea..41aa916 100644 --- a/roles/tasks/install-signalytic-deb.yml +++ b/roles/common/tasks/install-signalytic-deb.yml @@ -1,13 +1,14 @@ +--- ## Network Manager - name: Install signalytic-network manager ansible.builtin.apt: - deb: packages/signalytic-network-manager-1.1.v1-1_all.deb + deb: files/signalytic-network-manager-1.1.v1-1_all.deb fail_on_autoremove: true become: true ## Battery Manager - name: Install signalytic-battery manager ansible.builtin.apt: - deb: packages/signalytic-battery-manager_3.0_all.deb + deb: files/signalytic-battery-manager_3.0_all.deb fail_on_autoremove: true become: true diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml new file mode 100644 index 0000000..0578b71 --- /dev/null +++ b/roles/common/tasks/main.yml @@ -0,0 +1,18 @@ +--- +- name: Create system directories + ansible.builtin.import_tasks: create-dirs.yml + +- name: Install system utilities + ansible.builtin.import_tasks: system-utils.yml + +- name: Install signalytic-debian packages + ansible.builtin.import_tasks: install-signalytic-deb.yml + +- name: Install cellmodem package + ansible.builtin.import_tasks: install-cellmodem-package.yml + +- name: Install power-management package + ansible.builtin.import_tasks: install-power-management.yml + +- name: Install signalytic-ap package + ansible.builtin.import_tasks: install-signalytic-ap.yml diff --git a/roles/tasks/system-utils.yml b/roles/common/tasks/system-utils.yml similarity index 99% rename from roles/tasks/system-utils.yml rename to roles/common/tasks/system-utils.yml index 59374d4..d10d608 100644 --- a/roles/tasks/system-utils.yml +++ b/roles/common/tasks/system-utils.yml @@ -1,3 +1,4 @@ +--- - name: Install system utils ansible.builtin.apt: name: diff --git a/roles/tasks/main.yml b/roles/tasks/main.yml deleted file mode 100644 index 5ba712b..0000000 --- a/roles/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: Create system directories - ansible.legacy.import_tasks: create-dirs.yml - -- name: Install system utilities - ansible.legacy.import_tasks: system-utils.yml - -- name: Install signalytic-debian packages - ansible.legacy.import_tasks: install-signalytic-deb.yml - -- name: Install cellmodem package - ansible.legacy.import_tasks: install-cellmodem-package.yml - -- name: Install power-management package - ansible.legacy.import_tasks: install-power-management.yml - -- name: Install signalytic-ap package - ansible.legacy.import_tasks: install-signalytic-ap.yml