From bec67bbb0ff922c26abd86ba53da389c2c486292 Mon Sep 17 00:00:00 2001
From: Julien Georges <julien.georges@culture.gouv.fr>
Date: Fri, 10 Dec 2021 15:42:30 +0100
Subject: [PATCH] Add default value for disable_internet_repositories_install
(#581)
---
deployment/environments/vitamui_extra_vars.yml | 3 +++
deployment/roles/logstash/tasks/main.yml | 4 ++--
deployment/roles/normalize/tasks/vitamui.yml | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/deployment/environments/vitamui_extra_vars.yml b/deployment/environments/vitamui_extra_vars.yml
index 71acaca53..ec0f3ca58 100644
--- a/deployment/environments/vitamui_extra_vars.yml
+++ b/deployment/environments/vitamui_extra_vars.yml
@@ -45,6 +45,9 @@ vitam_repositories:
- key: vitam-extras
value: https://download.programmevitam.fr/vitam_nightly/rpm/vitam-extras/
+# To avoid installation of internet repositories (like epel for example)
+disable_internet_repositories_install: true # default value if unset: false
+
###
# reverse_proxy_conf.yml
reverse: apache
diff --git a/deployment/roles/logstash/tasks/main.yml b/deployment/roles/logstash/tasks/main.yml
index b15bb96c8..1c533c604 100644
--- a/deployment/roles/logstash/tasks/main.yml
+++ b/deployment/roles/logstash/tasks/main.yml
@@ -21,7 +21,7 @@
delay: "{{ packages_install_retries_delay }}"
when:
- ansible_os_family == "Debian"
- - disable_internet_repositories_install == false
+ - disable_internet_repositories_install | default(false) | bool == false
- name: "install openjdk only when Debian"
apt:
@@ -33,7 +33,7 @@
delay: "{{ packages_install_retries_delay }}"
when:
- ansible_os_family == "Debian"
- - disable_internet_repositories_install == true
+ - disable_internet_repositories_install | default(false) | bool == true
- name: Install logstash package from repo
package:
diff --git a/deployment/roles/normalize/tasks/vitamui.yml b/deployment/roles/normalize/tasks/vitamui.yml
index ce69b423e..e17f5c8dd 100644
--- a/deployment/roles/normalize/tasks/vitamui.yml
+++ b/deployment/roles/normalize/tasks/vitamui.yml
@@ -37,7 +37,7 @@
delay: "{{ packages_install_retries_delay }}"
when:
- ansible_os_family == "Debian"
- - disable_internet_repositories_install == false
+ - disable_internet_repositories_install | default(false) | bool == false
- name: "install openjdk only when Debian"
apt:
@@ -49,4 +49,4 @@
delay: "{{ packages_install_retries_delay }}"
when:
- ansible_os_family == "Debian"
- - disable_internet_repositories_install == true
+ - disable_internet_repositories_install | default(false) | bool == true
--
GitLab