iac/rproxy
3
0
Fork 0
Code Issues Pull Requests Packages Releases 9 Activity

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

Browse Source 
Reviewed-on: http://89.110.105.223:8080/IaC/rproxy/pulls/8
This commit is contained in:
Pavlov Makar
2024-09-27 23:19:45 +03:00
parent 21257cd521 199364e1ac
commit 0729d8023a
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@@ -8,9 +8,9 @@ pipeline {
base64File(name: "rootca", description: "RootCA (only for 'Install Rproxy')") base64File(name: "rootca", description: "RootCA (only for 'Install Rproxy')")
base64File(name: "rootca_key", description: "RootCA key (only for 'Install Rproxy')") base64File(name: "rootca_key", description: "RootCA key (only for 'Install Rproxy')")
booleanParam(name: "config_add", defaultValue: true, description: "Add config") 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_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 (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 (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 { stages {

30
roles/rproxy/tasks/main.yml
View File

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