Another little fix for some roles

exitfound · Dec 18, 2023 · 10db729 · 10db729
1 parent 538911b
commit 10db729
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 31 deletions.
diff --git a/ansible/roles/docker-jenkins-agent/defaults/main.yaml b/ansible/roles/docker-jenkins-agent/defaults/main.yaml
@@ -4,7 +4,7 @@
 
 docker_jenkins_agent_compose_file: "agent-docker-compose.yaml"
 docker_jenkins_agent_directory: "/opt/jenkins_agent_docker"
-docker_jenkins_agent_directory_mode: "u=rw,g=r,o=r"
+docker_jenkins_agent_directory_mode: "u=rwx,g=rx,o=r"
 docker_jenkins_agent_file_mode: "u=rw,g=r,o=r"
 docker_jenkins_agent_owner: "1000"
 docker_jenkins_agent_group: "1000"

diff --git a/ansible/roles/system-docker/tasks/debian.yaml b/ansible/roles/system-docker/tasks/debian.yaml
@@ -58,7 +58,7 @@
 
 # Проверка того, установлен ли Docker-compose в системе:
 - name: Check if Docker-compose is installed on Debian family distro
-  command: "{{ docker_compose_destination }} --version"
+  command: "{{ docker_compose_destination }} version"
   register: docker_compose_check
   ignore_errors: true
   changed_when: false

diff --git a/ansible/roles/system-docker/tasks/redhat.yaml b/ansible/roles/system-docker/tasks/redhat.yaml
@@ -52,7 +52,7 @@
 
 # Проверка того, установлен ли Docker-compose в системе:
 - name: Check if docker-compose is installed on RedHat family distro
-  command: "{{ docker_compose_destination }} --version"
+  command: "{{ docker_compose_destination }} version"
   register: docker_compose_check
   ignore_errors: true
   changed_when: false

diff --git a/ansible/roles/system-docker/tasks/suse.yaml b/ansible/roles/system-docker/tasks/suse.yaml
@@ -33,7 +33,7 @@
 
 # Проверка того, установлен ли Docker-compose в системе:
 - name: Check if docker-compose is installed on SUSE family distro
-  command: "{{ docker_compose_destination }} --version"
+  command: "{{ docker_compose_destination }} version"
   register: docker_compose_check
   ignore_errors: true
   changed_when: false

diff --git a/ansible/roles/system-prepare/defaults/main.yaml b/ansible/roles/system-prepare/defaults/main.yaml
@@ -1,11 +1,5 @@
 ---
 
-# Переменные, необходимые для установки пакетов, применимые ко всем дистрибутивам в равной степени:
-
-pip_packages_list:
-  - docker
-  - docker-compose
-
 # Переменные, необходимые для установки пакетов на дистрибутиве семейства SUSE:
 
 opensuse_packages_list:

diff --git a/ansible/roles/system-prepare/tasks/debian.yaml b/ansible/roles/system-prepare/tasks/debian.yaml
@@ -14,10 +14,3 @@
     name: "{{ ubuntu_packages_list }}"
     state: present
     update_cache: true
-
-# Установка пакетов pip из списка необходимых, которые определены в виде переменной, в директории defaults:
-- name: Install required packages for pip on Debian family distro
-  pip:
-    name: "{{ pip_packages_list }}"
-    state: present
-    executable: pip3
diff --git a/ansible/roles/system-prepare/tasks/redhat.yaml b/ansible/roles/system-prepare/tasks/redhat.yaml
@@ -14,10 +14,3 @@
     name: "{{ centos_packages_list }}"
     state: present
     update_cache: true
-
-# Установка пакетов pip из списка необходимых, которые определены в виде переменной, в директории defaults:
-- name: Install required packages for pip on RedHat family distro
-  pip:
-    name: "{{ pip_packages_list }}"
-    state: present
-    executable: pip3
diff --git a/ansible/roles/system-prepare/tasks/suse.yaml b/ansible/roles/system-prepare/tasks/suse.yaml
@@ -14,10 +14,3 @@
     name: "{{ opensuse_packages_list }}"
     state: present
     update_cache: true
-
-# Установка пакетов pip из списка необходимых, которые определены в виде переменной, в директории defaults:
-- name: Install required packages for pip on SUSE family distro
-  pip:
-    name: "{{ pip_packages_list }}"
-    state: present
-    executable: pip3