remove ansible-lint, fix service for skudak ddns container

This commit is contained in:
Bastian de Byl
2023-07-24 13:58:21 -04:00
parent 4c40a42707
commit 872f2bda84
4 changed files with 3 additions and 13 deletions

View File

@@ -1,4 +0,0 @@
exclude_paths:
- ansible/vars/vault.yml
- ansible/roles/hass/files/automations.yaml
- ansible/roles/hass/files/configuration.yaml

View File

@@ -14,7 +14,6 @@ PIP=${VENV_BIN}/pip
ANSIBLE=${VENV_BIN}/ansible-playbook ANSIBLE=${VENV_BIN}/ansible-playbook
ANSIBLE_VAULT=${VENV_BIN}/ansible-vault ANSIBLE_VAULT=${VENV_BIN}/ansible-vault
LINT_ANSIBLE=${VENV_BIN}/ansible-lint
LINT_YAML=${VENV_BIN}/yamllint LINT_YAML=${VENV_BIN}/yamllint
VAULT_PASS_FILE=.ansible-vaultpass VAULT_PASS_FILE=.ansible-vaultpass
@@ -33,7 +32,7 @@ ${VENV}:
python3 -m venv ${VENV} python3 -m venv ${VENV}
${PIP}: ${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 ${PIP} install -r requirements.txt
touch $@ touch $@
@@ -66,14 +65,10 @@ check: ${ANSIBLE} ${VAULT_FILE}
vault: ${ANSIBLE_VAULT} ${VAULT_FILE} vault: ${ANSIBLE_VAULT} ${VAULT_FILE}
${ANSIBLE_VAULT} edit --vault-password-file ${VAULT_PASS_FILE} ${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" @printf "Running yamllint...\n"
-@${LINT_YAML} ${YAML_FILES} -@${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} lint-ci: ${SKIP_FILE}
@printf "Running yamllint...\n" @printf "Running yamllint...\n"
@yamllint ${YAML_FILES} @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/

View File

@@ -51,4 +51,4 @@
- name: create systemd startup job for awsddns-skudak - name: create systemd startup job for awsddns-skudak
include_tasks: podman/systemd-generate.yml include_tasks: podman/systemd-generate.yml
vars: vars:
container_name: awsddns container_name: awsddns-skudak

View File

@@ -1,3 +1,2 @@
ansible-lint
ansible ansible
yamllint yamllint