Browse Source

Fix some deprecation warnings of ansible

remove-logs
Andreas Linz 3 years ago
parent
commit
ba566e4531
5 changed files with 17 additions and 9 deletions
  1. +11
    -3
      Makefile
  2. +1
    -1
      ansible.cfg
  3. +3
    -3
      playbook.yml
  4. +1
    -1
      roles/postgres/tasks/main.yml
  5. +1
    -1
      roles/prometheus/tasks/main.yml

+ 11
- 3
Makefile View File

@ -4,21 +4,29 @@ APPS:=$(dir $(wildcard build/*/))
all: vm
vm: vagrant
vm: playbook.yml Vagrantfile vagrant
ANSIBLE_HOST_KEY_CHECKING=False ansible-playbook\
--extra-vars='var_domain="klingt.vnet"'\
--private-key='./.vagrant/machines/default/virtualbox/private_key'\
--inventory-file='./.vagrant/provisioners/ansible/inventory/vagrant_ansible_inventory'\
--verbose\
playbook.yml
klingt.net: playbook.yml Vagrantfile
ansible-playbook\
--verbose\
playbook.yml
vagrant:
vagrant up
clean:
vagrant destroy -f
rm -f *.retry
clean-all: clean
clean-vm:
vagrant destroy -f
clean-all: clean clean-vm
@for app in $(APPS); do\
make -C "$$app" clean &> /dev/null;\
done

+ 1
- 1
ansible.cfg View File

@ -1,2 +1,2 @@
[defaults]
hostfile = ./hosts
inventory = ./hosts

+ 3
- 3
playbook.yml View File

@ -9,8 +9,8 @@
user_name: alinz
user_password: ThisIsInsecure
user_email: "{{ user_name }}@email-provider.com"
domain: klingt.vnet
domain_version: ''
domain: "{{ var_domain | default('klingt.net') }}"
domain_version: unknown
db_password: ThisIsInsecure
gitea_db_password: ThisIsInsecure
gitea_admin_password: ThisIsInsecure
@ -33,4 +33,4 @@
shell: git describe --always --tags
register: git_version
- set_fact:
domain_version: "{{ git_version.stdout }}"
domain_version: "{{ git_version.stdout }}"

+ 1
- 1
roles/postgres/tasks/main.yml View File

@ -35,4 +35,4 @@
login_user: "{{ user_name }}"
login_password: "{{ db_password }}"
- include: pgweb.yml
- import_tasks: pgweb.yml

+ 1
- 1
roles/prometheus/tasks/main.yml View File

@ -35,4 +35,4 @@
state: started
enabled: true
- include: node_exporter.yml
- import_tasks: node_exporter.yml

Loading…
Cancel
Save