diff --git a/ansible_deploy_dc/02_deploy_primary_dc.yml b/ansible/02_deploy_primary_dc.yml similarity index 98% rename from ansible_deploy_dc/02_deploy_primary_dc.yml rename to ansible/02_deploy_primary_dc.yml index 210f87d..eac3518 100644 --- a/ansible_deploy_dc/02_deploy_primary_dc.yml +++ b/ansible/02_deploy_primary_dc.yml @@ -3,8 +3,8 @@ - name: Разворачивание контроллера домена hosts: dctest1 vars_files: - - vars.yml - - mutable_vars.yml + - ./vars/vars.yml + - ./vars/mutable_vars.yml tasks: - name: Проверка соответствия ОС diff --git a/ansible_deploy_dc/03_check_dc.yml b/ansible/03_check_dc.yml similarity index 97% rename from ansible_deploy_dc/03_check_dc.yml rename to ansible/03_check_dc.yml index cd7d748..1b3eb85 100644 --- a/ansible_deploy_dc/03_check_dc.yml +++ b/ansible/03_check_dc.yml @@ -3,8 +3,8 @@ - name: Проверка состояния контроллера домена hosts: dctest1 vars_files: - - vars.yml - - mutable_vars.yml + - ./vars/vars.yml + - ./vars/mutable_vars.yml tasks: - name: Проверка наличия развёрнутого домена на хосте {{ ansible_hostname }} diff --git a/ansible_deploy_dc/04_add_samba_users.yml b/ansible/04_add_samba_users.yml similarity index 97% rename from ansible_deploy_dc/04_add_samba_users.yml rename to ansible/04_add_samba_users.yml index a71793b..a98f0f1 100644 --- a/ansible_deploy_dc/04_add_samba_users.yml +++ b/ansible/04_add_samba_users.yml @@ -5,7 +5,7 @@ vars: - samba_user_mode: create vars_files: - - samba_users.yml + - ./vars/samba_users.yml tasks: - name: Пользователи в домене Samba diff --git a/ansible_deploy_dc/05_add_samba_clients.yml b/ansible/05_add_samba_clients.yml similarity index 97% rename from ansible_deploy_dc/05_add_samba_clients.yml rename to ansible/05_add_samba_clients.yml index 0358b1a..895d43b 100644 --- a/ansible_deploy_dc/05_add_samba_clients.yml +++ b/ansible/05_add_samba_clients.yml @@ -3,8 +3,8 @@ - name: Добавление компьютеров в контроллер hosts: testws vars_files: - - vars.yml - - mutable_vars.yml + - ./vars/vars.yml + - ./vars/mutable_vars.yml tasks: - name: Проверка того, что узел не является членом домена diff --git a/ansible_deploy_dc/06_deploy_second_dc.yml b/ansible/06_deploy_second_dc.yml similarity index 98% rename from ansible_deploy_dc/06_deploy_second_dc.yml rename to ansible/06_deploy_second_dc.yml index 83908d1..fa767b6 100644 --- a/ansible_deploy_dc/06_deploy_second_dc.yml +++ b/ansible/06_deploy_second_dc.yml @@ -3,8 +3,8 @@ - name: Разворачивание контроллера домена hosts: dctest2 vars_files: - - vars.yml - - mutable_vars.yml + - ./vars/vars.yml + - ./vars/mutable_vars.yml tasks: - name: Проверка соответствия ОС diff --git a/ansible/hosts.ini b/ansible/hosts.ini index 23f26ea..cf7914d 100644 --- a/ansible/hosts.ini +++ b/ansible/hosts.ini @@ -1,2 +1,17 @@ [proxmox] pve ansible_host=10.1.1.10 ansible_user=root + +[dc] +alts1 ansible_host=10.1.1.11 ansible_user=root +alts2 ansible_host=10.1.1.12 ansible_user=root + +[nas] +alts3 ansible_host=10.1.1.13 ansible_user=root + +[test] +dctest1 ansible_host=192.168.13.139 ansible_user=root +dctest2 ansible_host=192.168.13.155 ansible_user=root + +[testws] +altws ansible_host=192.168.13.152 ansible_user=root +altkws ansible_host=192.168.13.153 ansible_user=root diff --git a/ansible_deploy_dc/mutable_vars.yml b/ansible/vars/mutable_vars.yml similarity index 100% rename from ansible_deploy_dc/mutable_vars.yml rename to ansible/vars/mutable_vars.yml diff --git a/ansible_deploy_dc/samba_users.yml b/ansible/vars/samba_users.yml similarity index 100% rename from ansible_deploy_dc/samba_users.yml rename to ansible/vars/samba_users.yml diff --git a/ansible_deploy_dc/vars.yml b/ansible/vars/vars.yml similarity index 100% rename from ansible_deploy_dc/vars.yml rename to ansible/vars/vars.yml diff --git a/ansible_deploy_dc/ansible.cfg b/ansible_deploy_dc/ansible.cfg deleted file mode 100644 index 7bcfcce..0000000 --- a/ansible_deploy_dc/ansible.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[defaults] -host_key_checking = false -inventory = ./hosts.ini -#private_key_file = /home/sysadmin/.ssh/id_rsa -private_key_file = /home/da2001/.ssh/id_rsa -interpreter_python=/usr/bin/python3 diff --git a/ansible_deploy_dc/hosts.ini b/ansible_deploy_dc/hosts.ini deleted file mode 100644 index 5465932..0000000 --- a/ansible_deploy_dc/hosts.ini +++ /dev/null @@ -1,14 +0,0 @@ -[dc] -alts1 ansible_host=10.1.1.11 ansible_user=root -alts2 ansible_host=10.1.1.12 ansible_user=root - -[nas] -alts3 ansible_host=10.1.1.13 ansible_user=root - -[test] -dctest1 ansible_host=192.168.13.139 ansible_user=root -dctest2 ansible_host=192.168.13.155 ansible_user=root - -[testws] -altws ansible_host=192.168.13.152 ansible_user=root -altkws ansible_host=192.168.13.153 ansible_user=root \ No newline at end of file