From 73d9e77ee03ff40bdc29a176611f65a820f43d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Fri, 3 Oct 2025 10:45:05 +0300 Subject: [PATCH] Update variables and add new collections --- init.sh | 5 +++-- src/functions/init.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/init.sh b/init.sh index 7f49847..252a08f 100755 --- a/init.sh +++ b/init.sh @@ -124,7 +124,8 @@ wi-init(){ then echo "---" > ~/.ansible/vars.yml echo "hostname: $HOSTNAME" >> ~/.ansible/vars.yml - echo "type: $TYPE" >> ~/.ansible/vars.yml + echo "info:" >> ~/.ansible/vars.yml + echo " type: $TYPE" >> ~/.ansible/vars.yml echo "config:" >> ~/.ansible/vars.yml echo " identity:" >> ~/.ansible/vars.yml echo " vault:" >> ~/.ansible/vars.yml @@ -137,7 +138,7 @@ wi-init(){ export HVT=${config["login",$ORG]} - /opt/ansible/bin/ansible-galaxy collection install ansible.posix ansible.utils community.crypto community.dns community.docker community.general community.hashi_vault community.libvirt community.mongodb community.mysql community.postgresql containers.podman --upgrade &> /dev/null + /opt/ansible/bin/ansible-galaxy collection install ansible.posix ansible.utils ansible.windows community.crypto community.dns community.docker community.general community.grafana community.hashi_vault community.libvirt community.mongodb community.mysql community.postgresql community.windows containers.podman --upgrade &> /dev/null /opt/ansible/bin/ansible-pull -U ssh://git@$GIT_DOMAIN:$GIT_PORT/$GIT_REPOSITORY -d ~/.ansible/pull/infra --accept-host-key --private-key ~/.ssh/keys/init --extra-vars @~/.ansible/vars.yml playbooks/init.yml -t init diff --git a/src/functions/init.sh b/src/functions/init.sh index 2a4b547..7cabf41 100644 --- a/src/functions/init.sh +++ b/src/functions/init.sh @@ -50,7 +50,8 @@ wi-init(){ then echo "---" > ~/.ansible/vars.yml echo "hostname: $HOSTNAME" >> ~/.ansible/vars.yml - echo "type: $TYPE" >> ~/.ansible/vars.yml + echo "info:" >> ~/.ansible/vars.yml + echo " type: $TYPE" >> ~/.ansible/vars.yml echo "config:" >> ~/.ansible/vars.yml echo " identity:" >> ~/.ansible/vars.yml echo " vault:" >> ~/.ansible/vars.yml @@ -63,7 +64,7 @@ wi-init(){ export HVT=${config["login",$ORG]} - /opt/ansible/bin/ansible-galaxy collection install ansible.posix ansible.utils community.crypto community.dns community.docker community.general community.hashi_vault community.libvirt community.mongodb community.mysql community.postgresql containers.podman --upgrade &> /dev/null + /opt/ansible/bin/ansible-galaxy collection install ansible.posix ansible.utils ansible.windows community.crypto community.dns community.docker community.general community.grafana community.hashi_vault community.libvirt community.mongodb community.mysql community.postgresql community.windows containers.podman --upgrade &> /dev/null /opt/ansible/bin/ansible-pull -U ssh://git@$GIT_DOMAIN:$GIT_PORT/$GIT_REPOSITORY -d ~/.ansible/pull/infra --accept-host-key --private-key ~/.ssh/keys/init --extra-vars @~/.ansible/vars.yml playbooks/init.yml -t init