From ee6d86bbf2646ca6f2828f0a8cc11944c121414d Mon Sep 17 00:00:00 2001
From: Haitao Pan <manbuzhe2009@qq.com>
Date: Fri, 24 Mar 2023 10:35:43 +0800
Subject: [PATCH] add depends: k3s -> common

---
 playbook/roles/common/tasks/main.yml | 20 +++++---------------
 playbook/roles/k3s/meta/main.yml     |  2 ++
 2 files changed, 7 insertions(+), 15 deletions(-)
 create mode 100644 playbook/roles/k3s/meta/main.yml

diff --git a/playbook/roles/common/tasks/main.yml b/playbook/roles/common/tasks/main.yml
index 1aec9b7b..5a298f93 100755
--- a/playbook/roles/common/tasks/main.yml
+++ b/playbook/roles/common/tasks/main.yml
@@ -1,15 +1,15 @@
-- name: update /etc/hostname
-  template: src=templates/hostname dest=/etc/hostname owner=root group=root mode=0644 unsafe_writes=yes
+- name: Set timezone
+  shell: "timedatectl set-timezone Asia/Shanghai"
 
 - name: Set hostname
   shell: "hostname -F /etc/hostname"
 
+- name: update /etc/hostname
+  template: src=templates/hostname dest=/etc/hostname owner=root group=root mode=0644 unsafe_writes=yes
+
 - name: Update /etc/hosts
   template: src=templates/hosts dest=/etc/hosts owner=root group=root mode=0644 force=yes unsafe_writes=yes
 
-- name: Set logrotate for monitor-agent log
-  template: src=templates/logrotate-monitor-agent dest=/etc/logrotate.d/monitor-agent owner=root group=root mode=0644 force=yes unsafe_writes=yes
-
 - name: Install packages
   shell: "yum makecache && yum install -y audit"
   when: ansible_facts['distribution'] != "Ubuntu"
@@ -18,13 +18,3 @@
   shell: "apt install -y auditd"
   when: ansible_facts['distribution'] == "Ubuntu"
 
-- name: Restart crond service
-  shell: "systemctl restart crond"
-  when: ansible_facts['distribution'] != "Ubuntu"
-
-- name: Restart crond service
-  shell: "systemctl restart cron"
-  when: ansible_facts['distribution'] == "Ubuntu"
-
-- name: Set timezone
-  shell: "timedatectl set-timezone Asia/Shanghai"
diff --git a/playbook/roles/k3s/meta/main.yml b/playbook/roles/k3s/meta/main.yml
new file mode 100644
index 00000000..9711b330
--- /dev/null
+++ b/playbook/roles/k3s/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - role: common