From 26ad048c76377d1e14e4a67913588d20851a5e94 Mon Sep 17 00:00:00 2001
From: ogrechko <ogrechko@top-sysops.ru>
Date: Sun, 28 Dec 2025 10:11:07 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20ansible/deploy=5Fall.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/deploy_all.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/ansible/deploy_all.yml b/ansible/deploy_all.yml
index d949184..24d0c7d 100644
--- a/ansible/deploy_all.yml
+++ b/ansible/deploy_all.yml
@@ -22,7 +22,7 @@
           }
 
     - name: Total Cleanup
-      shell: "rm -rf .terraform .terraform.lock.hcl terraform.tfstate*"
+      shell: "rm -rf .terraform .terraform.lock.hcl"
       args:
         chdir: "{{ tf_dir }}"
 
@@ -40,6 +40,7 @@
       shell: terraform apply -auto-approve -no-color -lock=false
       args:
         chdir: "{{ tf_dir }}"
+      register: tf_result
       environment:
         TF_CLI_CONFIG_FILE: "/tmp/.terraformrc"
         TF_HTTP_ADDRESS: "{{ lookup('env', 'TF_HTTP_ADDRESS') }}"
@@ -49,30 +50,32 @@
         TF_VAR_proxmox_api_token_secret: "{{ lookup('env', 'TF_VAR_proxmox_api_token_secret') }}"
         TF_VAR_proxmox_api_url: "{{ lookup('env', 'TF_VAR_proxmox_api_url') }}"
 
+    - name: Show Apply Output
+      debug:
+        var: tf_result.stdout_lines
 
-    - name: Dynamically add hosts to Ansible memory
+    - name: Dynamically add hosts to inventory
       add_host:
         name: "{{ item.name }}"
         groups: 
           - k8s_new_nodes
           - "{{ 'masters' if 'master' in item.name else 'workers' }}"
         ansible_host: "{{ item.ip }}"
-        ansible_user: ubuntu # ИСПОЛЬЗУЕМ ubuntu ИЗ CLOUD-INIT
+        ansible_user: ubuntu
         ansible_ssh_extra_args: "-o StrictHostKeyChecking=no"
       loop:
-        - { name: 'master-01', ip: '10.33.33.201' }
-        - { name: 'worker-01', ip: '10.33.33.202' }
-        - { name: 'worker-02', ip: '10.33.33.203' }
+        - { name: 'k8s-master', ip: '10.33.33.201' }
+        - { name: 'k8s-worker-1', ip: '10.33.33.202' }
+        - { name: 'k8s-worker-2', ip: '10.33.33.203' }
 
-- name: Step 2 - Wait for SSH and Prepare
+- name: Step 2 - Wait for SSH
   hosts: k8s_new_nodes
   gather_facts: false
   tasks:
-    - name: Wait for SSH to be ready on new VMs
+    - name: Wait for SSH to be ready
       wait_for_connection:
         delay: 10
         timeout: 300
 
-# Step 3 - Запускаем твой основной плейбук установки K8s
-- name: Step 3 - Install Kubernetes Cluster
+- name: Step 3 - K8s Setup
   import_playbook: k8s_setup.yml
\ No newline at end of file