From 9121b5edc0f207e475b152629e393d79a1b25284 Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Thu, 15 Sep 2022 06:04:38 +0200 Subject: [PATCH] Replace Nix-based ansible-lint --- .drone.yml | 5 +++-- ansible/README.md | 4 ++-- ansible/requirements.txt | 2 ++ default.nix | 13 ------------- 4 files changed, 7 insertions(+), 17 deletions(-) create mode 100644 ansible/requirements.txt delete mode 100644 default.nix diff --git a/.drone.yml b/.drone.yml index 20d847f..6c100f5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,7 @@ type: docker name: ansible steps: - name: ansible-lint - image: nixos/nix:2.11.0 + image: python:3.10.7 commands: - - nix run -c ansible-lint ansible + - pip install -r ansible/requirements.txt > /dev/null 2> /dev/null + - ansible-lint ansible diff --git a/ansible/README.md b/ansible/README.md index 51e668e..0c76780 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -2,10 +2,10 @@ ## Ansible Control Node Setup -Run in repository root to use `ansible-*` commands: +In a Python 3 environment (perhaps a venv), run: ``` -nix run -c $SHELL +pip install -r requirements.txt ``` ## `misc.yaml` diff --git a/ansible/requirements.txt b/ansible/requirements.txt new file mode 100644 index 0000000..b1dd5dc --- /dev/null +++ b/ansible/requirements.txt @@ -0,0 +1,2 @@ +ansible==6.4.0 +ansible-lint==6.5.2 diff --git a/default.nix b/default.nix deleted file mode 100644 index 80de056..0000000 --- a/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - pkgs ? import {} -}: -let - paths = with pkgs; [ - ansible - ansible-lint - ]; -in - pkgs.buildEnv { - name = "infrastructure-env"; - paths = paths; - }