diff --git a/.ansible-lint b/.ansible-lint deleted file mode 100644 index 1679d20..0000000 --- a/.ansible-lint +++ /dev/null @@ -1,4 +0,0 @@ -exclude_paths: - - ansible/vars/vault.yml - - ansible/roles/hass/files/automations.yaml - - ansible/roles/hass/files/configuration.yaml diff --git a/Makefile b/Makefile index d010db0..e8cf6de 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,6 @@ PIP=${VENV_BIN}/pip ANSIBLE=${VENV_BIN}/ansible-playbook ANSIBLE_VAULT=${VENV_BIN}/ansible-vault -LINT_ANSIBLE=${VENV_BIN}/ansible-lint LINT_YAML=${VENV_BIN}/yamllint VAULT_PASS_FILE=.ansible-vaultpass @@ -33,7 +32,7 @@ ${VENV}: python3 -m venv ${VENV} ${PIP}: ${VENV} -${ANSIBLE} ${ANSIBLE_VAULT} ${LINT_YAML} ${LINT_ANSIBLE}: ${VENV} requirements.txt +${ANSIBLE} ${ANSIBLE_VAULT} ${LINT_YAML}: ${VENV} requirements.txt ${PIP} install -r requirements.txt touch $@ @@ -66,14 +65,10 @@ check: ${ANSIBLE} ${VAULT_FILE} vault: ${ANSIBLE_VAULT} ${VAULT_FILE} ${ANSIBLE_VAULT} edit --vault-password-file ${VAULT_PASS_FILE} ${VAULT_FILE} -lint: ${LINT_YAML} ${LINT_ANSIBLE} ${SKIP_FILE} +lint: ${LINT_YAML} ${SKIP_FILE} @printf "Running yamllint...\n" -@${LINT_YAML} ${YAML_FILES} - @. ${SKIP_FILE}; printf "Running ansible-lint with SKIP_LIST: [%s]...\n" "$$ANSIBLE_LINT_SKIP_LIST" - -@. ${SKIP_FILE}; ${LINT_ANSIBLE} -x $$ANSIBLE_LINT_SKIP_LIST ansible/ lint-ci: ${SKIP_FILE} @printf "Running yamllint...\n" @yamllint ${YAML_FILES} - @. ${SKIP_FILE}; printf "Running ansible-lint with SKIP_LIST: [%s]...\n" "$$ANSIBLE_LINT_SKIP_LIST" - @. ${SKIP_FILE}; ansible-lint -x $$ANSIBLE_LINT_SKIP_LIST ansible/ diff --git a/ansible/roles/podman/tasks/container-awsddns.yml b/ansible/roles/podman/tasks/container-awsddns.yml index 49ae694..489f294 100644 --- a/ansible/roles/podman/tasks/container-awsddns.yml +++ b/ansible/roles/podman/tasks/container-awsddns.yml @@ -51,4 +51,4 @@ - name: create systemd startup job for awsddns-skudak include_tasks: podman/systemd-generate.yml vars: - container_name: awsddns + container_name: awsddns-skudak diff --git a/requirements.txt b/requirements.txt index 201d219..03869fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ -ansible-lint ansible yamllint