diff --git a/roles/terraform/tasks/main.yml b/roles/terraform/tasks/main.yml new file mode 100755 index 0000000..ee1e39a --- /dev/null +++ b/roles/terraform/tasks/main.yml @@ -0,0 +1,46 @@ +- name: Install git + become: "{{ false if inventory_hostname == 'nas.home.lan' else true }}" + vars: + hashicorp_repo_url: "https://apt.releases.hashicorp.com" + hashicorp_keyring_path: "/usr/share/keyrings/hashicorp-archive-keyring.gpg" + + block: + + - name: Ensure required packages are installed + ansible.builtin.apt: + name: + - gnupg + - software-properties-common + state: present + update_cache: true + + - name: Download HashiCorp GPG key + ansible.builtin.get_url: + url: "{{ hashicorp_repo_url }}/gpg" + dest: /tmp/hashicorp.gpg + mode: '0644' + + - name: Convert GPG key to keyring format + ansible.builtin.command: + cmd: gpg --dearmor -o {{ hashicorp_keyring_path }} /tmp/hashicorp.gpg + args: + creates: "{{ hashicorp_keyring_path }}" + + - name: Add HashiCorp APT repository + ansible.builtin.apt_repository: + repo: > + deb [arch={{ ansible_architecture | replace('x86_64','amd64') }} + signed-by={{ hashicorp_keyring_path }}] + {{ hashicorp_repo_url }} + {{ ansible_distribution_release }} main + filename: hashicorp + state: present + + - name: Update apt cache + ansible.builtin.apt: + update_cache: true + + - name: Install Terraform + ansible.builtin.apt: + name: terraform + state: present diff --git a/roles/zabbix_proxy/tasks/AlmaLinux.yml b/roles/zabbix_proxy/tasks/AlmaLinux.yml index 5cdabf5..c95d846 100644 --- a/roles/zabbix_proxy/tasks/AlmaLinux.yml +++ b/roles/zabbix_proxy/tasks/AlmaLinux.yml @@ -167,7 +167,7 @@ line: "{{ item.key }}={{ item.value }}" loop: - { key: "Server", value: "127.0.0.1" } - - { key: "ServerActive", value: "{{ clustename }}-vm01.home.lan;{{ clustename }}-vm02.home.lan;{{ clustename }}-vm03.home.lan;{{ clustename }}-vm04.home.lan;{{ clustename }}-vm05.home.lan" } + - { key: "ServerActive", value: "{{ clustename }}-vm01.home.lan;{{ clustename }}-vm02.home.lan;{{ clustename }}-vm03.home.lan;{{ clustename }}-vm04.home.lan;{{ clustename }}-vm05.home.lan;rocky9-vm05.home.lan" } - { key: "Hostname", value: "{{ inventory_hostname }}" } - { key: "HostMetadata", value: "linux,jaydee,auto_proxy" } - { key: "SourceIP", value: "{{ ansible_default_ipv4.address }}" } diff --git a/roles/zabbix_proxy/tasks/Debian.yml b/roles/zabbix_proxy/tasks/Debian.yml index bc57d6e..efc45f3 100644 --- a/roles/zabbix_proxy/tasks/Debian.yml +++ b/roles/zabbix_proxy/tasks/Debian.yml @@ -140,7 +140,7 @@ line: "{{ item.key }}={{ item.value }}" loop: - { key: "Server", value: "127.0.0.1" } - - { key: "ServerActive", value: "{{ clustename }}-vm01.home.lan;{{ clustename }}-vm02.home.lan;{{ clustename }}-vm03.home.lan;{{ clustename }}-vm04.home.lan;{{ clustename }}-vm05.home.lan" } + - { key: "ServerActive", value: "{{ clustename }}-vm01.home.lan;{{ clustename }}-vm02.home.lan;{{ clustename }}-vm03.home.lan;{{ clustename }}-vm04.home.lan;{{ clustename }}-vm05.home.lan;rocky9-vm05.home.lan" } - { key: "Hostname", value: "{{ inventory_hostname }}" } - { key: "HostMetadata", value: "linux,jaydee,auto_proxy" } - { key: "SourceIP", value: "{{ ansible_default_ipv4.address }}" } diff --git a/roles/zabbix_proxy/tasks/Rocky.yml b/roles/zabbix_proxy/tasks/Rocky.yml index fc4c1b7..3dd0f44 100644 --- a/roles/zabbix_proxy/tasks/Rocky.yml +++ b/roles/zabbix_proxy/tasks/Rocky.yml @@ -153,7 +153,7 @@ line: "{{ item.key }}={{ item.value }}" loop: - { key: "Server", value: "127.0.0.1" } - - { key: "ServerActive", value: "{{ clustename }}-vm01.home.lan;{{ clustename }}-vm02.home.lan;{{ clustename }}-vm03.home.lan;{{ clustename }}-vm04.home.lan;{{ clustename }}-vm05.home.lan" } + - { key: "ServerActive", value: "{{ clustename }}-vm01.home.lan;{{ clustename }}-vm02.home.lan;{{ clustename }}-vm03.home.lan;{{ clustename }}-vm04.home.lan;{{ clustename }}-vm05.home.lan;rocky9-vm05.home.lan" } - { key: "Hostname", value: "{{ inventory_hostname }}" } - { key: "HostMetadata", value: "linux,jaydee,auto_proxy" } - { key: "SourceIP", value: "{{ ansible_default_ipv4.address }}" }