Merge pull request 'el8_migration' (#8) from el8_migration into dev

Reviewed-on: http://89.110.105.223:8080/IaC/rproxy/pulls/8
This commit is contained in:
2024-09-27 23:19:45 +03:00
2 changed files with 20 additions and 16 deletions

6
Jenkinsfile vendored
View File

@@ -8,9 +8,9 @@ pipeline {
base64File(name: "rootca", description: "RootCA (only for 'Install Rproxy')")
base64File(name: "rootca_key", description: "RootCA key (only for 'Install Rproxy')")
booleanParam(name: "config_add", defaultValue: true, description: "Add config")
string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name (for 'Add config' job only)")
string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port (for 'Add config' job only)")
string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address (for 'Add config' job only)")
string(name: "rproxy_service_name", defaultValue: "", trim: true, description: "Service name, ex: jenkins (for 'Add config' job only)")
string(name: "rproxy_service_port", defaultValue: "", trim: true, description: "Service port, ex: 8080 (for 'Add config' job only)")
string(name: "rproxy_service_address", defaultValue: "", trim: true, description: "Service address, ex: 10.10.10.10 (for 'Add config' job only)")
}
stages {

View File

@@ -7,28 +7,32 @@
- install
- add_config
- name: Install dependencies (Debian)
- name: Install docker (Debian)
ansible.builtin.apt:
name:
- docker.io
- docker-compose
update_cache: yes
when: ansible_facts['os_family'] == "Debian"
tags: install
- name: Install dependencies (RHEL)
ansible.builtin.pip:
name:
- docker
- docker-compose
when: ansible_facts['os_family'] == "RedHat"
- name: Install dependencies RHEL
block:
- name: Install docker (RHEL)
ansible.builtin.pip:
name:
- docker
- docker-compose
when: ansible_facts['os_family'] == "RedHat"
- name: Enable docker (RHEL)
ansible.builtin.systemd:
name: docker
state: restarted
enabled: true
daemon_reload: true
- name: Enable docker (RHEL)
ansible.builtin.systemd:
name: docker
state: restarted
enabled: true
daemon_reload: true
when: ansible_facts['os_family'] == "RedHat"
tags: install
- name: Install rproxy
block: