From 5ecbb4dae63c291ce1c3be3dcef44308600e3edd Mon Sep 17 00:00:00 2001 From: Nicola Belluti Date: Wed, 8 May 2024 13:06:44 +0200 Subject: [PATCH] Added Nix Flake --- .gitignore | 1 - README.md | 7 +----- ansible.cfg | 2 +- flake.lock | 27 ++++++++++++++++++++++++ flake.nix | 25 ++++++++++++++++++++++ playbooks/test_playbook.yml | 2 +- requirements.txt | 2 -- roles/test_role/README.md | 8 +++---- roles/test_role/defaults/main.yml | 2 +- roles/test_role/tasks/main.yml | 5 +++-- roles/test_role/templates/ansible.txt.j2 | 4 ++-- 11 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix delete mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index 19971ae..424bd26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ .ansible/ -.venv/ diff --git a/README.md b/README.md index 9a85fa7..5b7f05d 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,10 @@ A template for an Ansible repository # Requirements -You need to have `ssh` and `python3` installed. If you want to access a server using username and password you need to install `sshpass` as well - To use this repository run: ```sh git clone https://git.nicolabelluti.me/nicolabelluti/template-ansible cd template-ansible - -python -m venv .venv -source .venv/bin/activate -pip install -r requirements.txt +nix develop ``` diff --git a/ansible.cfg b/ansible.cfg index acef085..a4df8da 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -9,7 +9,7 @@ nocows = true inventory = ./inventory # (string) Sets the macro for the 'ansible_managed' variable available for :ref:`ansible_collections.ansible.builtin.template_module` and :ref:`ansible_collections.ansible.windows.win_template_module`. This is only relevant for those two modules. -ansible_managed = This file was last modified by {{{{ '{uid}' | replace('-', ' ') | title }}}} on %Y-%m-%d %H:%M. The template for this file can be found under {{{{ template_fullpath | relpath }}}} +ansible_managed = This file is managed with Ansible # (pathspec) Colon separated paths in which Ansible will search for Roles. roles_path = ./roles diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..a6a02cd --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..6bfd2c2 --- /dev/null +++ b/flake.nix @@ -0,0 +1,25 @@ +{ + description = "Ansible"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + }; + + outputs = { self, nixpkgs, ... }: + let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + devShells.${system}.default = pkgs.mkShell { + + buildInputs = with pkgs; [ + openssh + sshpass + + ansible + ansible-lint + ]; + + }; + }; +} diff --git a/playbooks/test_playbook.yml b/playbooks/test_playbook.yml index fe5b14f..58c3dc1 100644 --- a/playbooks/test_playbook.yml +++ b/playbooks/test_playbook.yml @@ -4,4 +4,4 @@ - name: Test Role role: test_role vars: - lorem_ipsum_string: Lorem Ipsum is simply dummy text + test_role__lorem_ipsum_string: Lorem Ipsum is simply dummy text diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 7a576c3..0000000 --- a/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -ansible ~= 8.3.0 -ansible-lint ~= 6.18.0 diff --git a/roles/test_role/README.md b/roles/test_role/README.md index 1fce1ba..2790340 100644 --- a/roles/test_role/README.md +++ b/roles/test_role/README.md @@ -4,7 +4,7 @@ A brief description about the role... ## Variables -| Name | Is Required? | Default | -|:--------------------:|:------------:|:-------------:| -| `hello_world_string` | ✔️ | Hello, World! | -| `lorem_ipsum_string` | ❌ | | +| Name | Is Required? | Default | +|:-------------------------------:|:------------:|:-------------:| +| `test_role__hello_world_string` | ✔️ | Hello, World! | +| `test_role__lorem_ipsum_string` | ❌ | | diff --git a/roles/test_role/defaults/main.yml b/roles/test_role/defaults/main.yml index 05d43ab..884f345 100644 --- a/roles/test_role/defaults/main.yml +++ b/roles/test_role/defaults/main.yml @@ -1 +1 @@ -hello_world_string: Hello, World! +test_role__hello_world_string: Hello, World! diff --git a/roles/test_role/tasks/main.yml b/roles/test_role/tasks/main.yml index a623356..7975668 100644 --- a/roles/test_role/tasks/main.yml +++ b/roles/test_role/tasks/main.yml @@ -3,9 +3,10 @@ - name: Print an "Hello, World!" ansible.builtin.debug: - msg: "{{ hello_world_string }}" + msg: "{{ test_role__hello_world_string }}" - name: Test the `ansible_managed` variable ansible.builtin.template: dest: /tmp/ansible.txt - src: ansible.txt.j2 + src: ansible.txt.j2 + mode: preserve diff --git a/roles/test_role/templates/ansible.txt.j2 b/roles/test_role/templates/ansible.txt.j2 index 81d6aab..921503f 100644 --- a/roles/test_role/templates/ansible.txt.j2 +++ b/roles/test_role/templates/ansible.txt.j2 @@ -1,3 +1,3 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment('plain') }} -{{ lorem_ipsum_string }} +{{ test_role__lorem_ipsum_string }}