From d1350bf38b17cbf37af52261e3a1ea2159d9656b Mon Sep 17 00:00:00 2001 From: Hayato Date: Fri, 6 Sep 2024 18:59:48 +0900 Subject: [PATCH] Merge apt task --- console.yml | 2 +- jenkins.yml | 2 +- ollama.yml | 2 +- tasks/{console => }/apt.yml | 0 tasks/jenkins/apt.yml | 6 ------ tasks/ollama/apt.yml | 6 ------ 6 files changed, 3 insertions(+), 15 deletions(-) rename tasks/{console => }/apt.yml (100%) delete mode 100644 tasks/jenkins/apt.yml delete mode 100644 tasks/ollama/apt.yml diff --git a/console.yml b/console.yml index 2e5bc45..e964f74 100644 --- a/console.yml +++ b/console.yml @@ -87,7 +87,7 @@ - name: Apt install ansible.builtin.import_tasks: - file: tasks/console/apt.yml + file: tasks/apt.yml - name: Install Pre-builded Rename-util ansible.builtin.import_tasks: diff --git a/jenkins.yml b/jenkins.yml index 33730e8..d17623e 100644 --- a/jenkins.yml +++ b/jenkins.yml @@ -44,7 +44,7 @@ - name: Apt install ansible.builtin.import_tasks: - file: tasks/jenkins/apt.yml + file: tasks/apt.yml - name: Install Jenkins ansible.builtin.import_role: diff --git a/ollama.yml b/ollama.yml index 3426128..500b3cd 100644 --- a/ollama.yml +++ b/ollama.yml @@ -73,7 +73,7 @@ - name: Apt install ansible.builtin.import_tasks: - file: tasks/ollama/apt.yml + file: tasks/apt.yml - name: Stop Apt-daily ansible.builtin.import_tasks: diff --git a/tasks/console/apt.yml b/tasks/apt.yml similarity index 100% rename from tasks/console/apt.yml rename to tasks/apt.yml diff --git a/tasks/jenkins/apt.yml b/tasks/jenkins/apt.yml deleted file mode 100644 index 5d8dc31..0000000 --- a/tasks/jenkins/apt.yml +++ /dev/null @@ -1,6 +0,0 @@ -- name: Install Console modules - ansible.builtin.apt: - update_cache: true - pkg: - "{{ item }}" - loop: "{{ apt }}" diff --git a/tasks/ollama/apt.yml b/tasks/ollama/apt.yml deleted file mode 100644 index 5d8dc31..0000000 --- a/tasks/ollama/apt.yml +++ /dev/null @@ -1,6 +0,0 @@ -- name: Install Console modules - ansible.builtin.apt: - update_cache: true - pkg: - "{{ item }}" - loop: "{{ apt }}"