11 files changed, 48 insertions, 22 deletions
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index 9318edc..9f47740 100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -4,7 +4,7 @@ library    = ./library/
 forks = 5
 host_key_checking = False
 retry_files_enabled = False
-inventory = ./inventory.proxmox.yaml
+inventory = ./inventory
 vault_password_file = ./.vault_password
 interpreter_python = auto_silent
 
diff --git a/ansible/inventory/group_vars/all.yml b/ansible/inventory/group_vars/all.yml
new file mode 100644
index 0000000..6d97636
--- /dev/null
+++ b/ansible/inventory/group_vars/all.yml
@@ -0,0 +1,3 @@
+---
+ansible_user: mas
+...
diff --git a/ansible/inventory/group_vars/tag_vps.yml b/ansible/inventory/group_vars/tag_vps.yml
new file mode 100644
index 0000000..4ec7635
--- /dev/null
+++ b/ansible/inventory/group_vars/tag_vps.yml
@@ -0,0 +1,3 @@
+---
+ansible_user: debian
+...
diff --git a/ansible/inventory/inventory.openstack.yaml b/ansible/inventory/inventory.openstack.yaml
new file mode 100644
index 0000000..f2244c0
--- /dev/null
+++ b/ansible/inventory/inventory.openstack.yaml
@@ -0,0 +1,16 @@
+---
+# https://docs.ansible.com/projects/ansible/latest/collections/openstack/cloud/openstack_inventory.html
+plugin: openstack.cloud.openstack
+all_projects: false
+expand_hostvars: true
+fail_on_errors: true
+only_clouds:
+  - "openstack"
+strict: true
+
+# Group VMs by tags for reference in playbooks.
+keyed_groups:
+  - key: openstack.metadata.tags | split(',') | map('trim') | list
+    prefix: "tag_"
+    separator: ""
+...
diff --git a/ansible/inventory.proxmox.yaml b/ansible/inventory/inventory.proxmox.yaml
index 1b4fb6f..1b4fb6f 100644
--- a/ansible/inventory.proxmox.yaml
+++ b/ansible/inventory/inventory.proxmox.yaml
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index cd4b021..97288bd 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -4,4 +4,8 @@ collections:
     version: ">=12.2.0"
   - name: community.proxmox
     version: ">=1.5.0"
+  - name: ansible.posix
+    version: ">=2.2.0"
+  - name: openstack.cloud
+    version: ">=2.5.0"
 ...
diff --git a/ansible/roles/k8s/tasks/install_helm.yml b/ansible/roles/k8s/tasks/install_helm.yml
index 244950a..4527a96 100644
--- a/ansible/roles/k8s/tasks/install_helm.yml
+++ b/ansible/roles/k8s/tasks/install_helm.yml
@@ -1,30 +1,30 @@
 ---
 - name: Check if Helm is already installed
-  command: helm version --short
+  ansible.builtin.command: helm version --short
   register: helm_installed
   ignore_errors: true
   changed_when: false
 
 - name: Download Helm install script
-  get_url:
+  ansible.builtin.get_url:
     url: https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
     dest: /tmp/get_helm.sh
     mode: '0755'
   when: helm_installed is failed or helm_installed.rc != 0
 
 - name: Install Helm
-  command: /tmp/get_helm.sh
+  ansible.builtin.command: /tmp/get_helm.sh
   become: true
   when: helm_installed is failed or helm_installed.rc != 0
   register: helm_install_result
   changed_when: "'Helm' in helm_install_result.stdout"
 
 - name: Verify Helm installation
-  command: helm version --short
+  ansible.builtin.command: helm version --short
   register: helm_version
   changed_when: false
 
 - name: Display Helm version
-  debug:
+  ansible.builtin.debug:
     msg: "Helm {{ helm_version.stdout }} is installed"
 ...
diff --git a/ansible/roles/k8s/tasks/install_k3s_master.yml b/ansible/roles/k8s/tasks/install_k3s_master.yml
index dfb416f..c84a95b 100644
--- a/ansible/roles/k8s/tasks/install_k3s_master.yml
+++ b/ansible/roles/k8s/tasks/install_k3s_master.yml
@@ -26,6 +26,7 @@
   ansible.builtin.command: /opt/k3s/install_k3s.sh server --cluster-init
   become: true
   when: not k3s_installed.stat.exists
+  changed_when: true
 
 - name: Retrieve k3s token
   ansible.builtin.slurp:
diff --git a/ansible/roles/k8s/tasks/install_k3s_worker.yml b/ansible/roles/k8s/tasks/install_k3s_worker.yml
index eda028b..44622fc 100644
--- a/ansible/roles/k8s/tasks/install_k3s_worker.yml
+++ b/ansible/roles/k8s/tasks/install_k3s_worker.yml
@@ -35,4 +35,5 @@
     --token {{ k3s_token }}
   become: true
   when: not k3s_agent_installed.stat.exists
+  changed_when: true
 ...
diff --git a/ansible/roles/nginx/tasks/main.yml b/ansible/roles/nginx/tasks/main.yml
new file mode 100644
index 0000000..050da5c
--- /dev/null
+++ b/ansible/roles/nginx/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+- name: Update nginx
+  ansible.builtin.include_tasks: update_nginx.yml
+...
diff --git a/ansible/roles/nginx/tasks/update_nginx.yml b/ansible/roles/nginx/tasks/update_nginx.yml
index ffe2725..188975a 100644
--- a/ansible/roles/nginx/tasks/update_nginx.yml
+++ b/ansible/roles/nginx/tasks/update_nginx.yml
@@ -1,19 +1,13 @@
 ---
-- name: Update nginx if needed
-  hosts: vps
-  become: true
-  become_user: root
-  tasks:
+- name: Ensure nginx is at the latest version
+  ansible.builtin.package:
+    name: nginx
+    state: present
+  notify: restart nginx
 
-    - name: Ensure nginx is at the latest version
-      ansible.builtin.package:
-        name: nginx
-        state: latest
-      notify: restart nginx
-
-    - name: Ensure nginx is running
-      ansible.builtin.service:
-        name: nginx
-        state: started
-        enabled: true
+- name: Ensure nginx is running
+  ansible.builtin.service:
+    name: nginx
+    state: started
+    enabled: true
 ...