summaryrefslogtreecommitdiff
path: root/ansible/roles
diff options
context:
space:
mode:
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/dc01/tasks/reboot.yaml2
-rw-r--r--ansible/roles/srv01/tasks/join_domain.yaml2
-rw-r--r--ansible/roles/srv01/tasks/reboot.yaml8
-rw-r--r--ansible/roles/srv01/tasks/set_hostname.yaml8
4 files changed, 11 insertions, 9 deletions
diff --git a/ansible/roles/dc01/tasks/reboot.yaml b/ansible/roles/dc01/tasks/reboot.yaml
index 0e944d0..f36b168 100644
--- a/ansible/roles/dc01/tasks/reboot.yaml
+++ b/ansible/roles/dc01/tasks/reboot.yaml
@@ -1,3 +1,3 @@
-- name: "reboot"
+- name: reboot
ansible.windows.win_reboot:
reboot_timeout: 3600
diff --git a/ansible/roles/srv01/tasks/join_domain.yaml b/ansible/roles/srv01/tasks/join_domain.yaml
index 381abea..7f5796d 100644
--- a/ansible/roles/srv01/tasks/join_domain.yaml
+++ b/ansible/roles/srv01/tasks/join_domain.yaml
@@ -1,4 +1,4 @@
-- name: "execute join-domain.sh"
+- name: execute join-domain.sh
script: ../../../scripts/join-domain.sh -d "{{ main_domain_name }}" -n "{{ main_dc01_ip_address }}" -p "{{ default_win_password }}"
args:
executable: /bin/bash
diff --git a/ansible/roles/srv01/tasks/reboot.yaml b/ansible/roles/srv01/tasks/reboot.yaml
index f521bdc..d36ed0d 100644
--- a/ansible/roles/srv01/tasks/reboot.yaml
+++ b/ansible/roles/srv01/tasks/reboot.yaml
@@ -1,5 +1,3 @@
-- name: "reboot"
- command: "shutdown -r now &"
- async: 1
- poll: 0
- ignore_errors: true
+- name: reboot
+ ansible.builtin.reboot:
+ reboot_timeout: 3600
diff --git a/ansible/roles/srv01/tasks/set_hostname.yaml b/ansible/roles/srv01/tasks/set_hostname.yaml
index 6e04085..9141763 100644
--- a/ansible/roles/srv01/tasks/set_hostname.yaml
+++ b/ansible/roles/srv01/tasks/set_hostname.yaml
@@ -1,5 +1,9 @@
-- name: "update /etc/hosts"
+- name: set hostname
+ ansible.builtin.hostname:
+ name: "{{ main_linux_srv01_hostname }}.{{ main_domain_name }}"
+
+- name: update /etc/hosts
ansible.builtin.replace:
path: /etc/hosts
- regexp: "ubuntu-server2404"
+ regexp: "ubuntu"
replace: "{{ main_linux_srv01_hostname }}.{{ main_domain_name }} {{ main_linux_srv01_hostname }}"