diff --git a/Jenkinsfile b/Jenkinsfile index 70c19d7..9a72b63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 { diff --git a/roles/rproxy/tasks/main.yml b/roles/rproxy/tasks/main.yml index 04abdb4..6fc787c 100644 --- a/roles/rproxy/tasks/main.yml +++ b/roles/rproxy/tasks/main.yml @@ -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: