made elasticrepo configurable

2020-01-16 13:26:34 +01:00 · 2020-01-16 13:26:34 +01:00 · b9b2663b3d
commit b9b2663b3d
parent d328609f29
15 changed files with 32 additions and 26 deletions
--- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
@ -7,8 +7,10 @@ elasticsearch_jvm_xms: null
 elastic_stack_version: 7.5.1
 elasticsearch_lower_disk_requirements: false

-elasticrepo_server: https://artifacts.elastic.co/packages/7.x/apt
-elasticrepo_gpg_keyserver: pool.sks-keyservers.net
+elasticrepo:
+  apt: 'https://artifacts.elastic.co/packages/7.x/apt'
+  yum: 'https://artifacts.elastic.co/packages/7.x/yum'
+  gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'

 # Cluster Settings
 single_node: true
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/Debian.yml
@ -30,13 +30,13 @@

 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
  apt_key:
-    url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
+    url: "{{ elasticrepo.gpg }}"
    id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
    state: present

 - name: Debian/Ubuntu | Install Elastic repo
  apt_repository:
-    repo: "deb {{ elasticrepo_server }} stable main"
+    repo: "deb {{ elasticrepo.apt }} stable main"
    state: present
    filename: 'elastic_repo_7'
    update_cache: true
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RMDebian.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RMDebian.yml
@ -1,6 +1,6 @@
 ---
 - name: Debian/Ubuntu | Removing Elasticsearch repository
  apt_repository:
-    repo: deb https://artifacts.elastic.co/packages/7.x/apt stable main
+    repo: "deb {{ elasticrepo.apt }} stable main"
    state: absent
  changed_when: false
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RMRedHat.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RMRedHat.yml
@ -1,6 +1,6 @@
 ---
 - name: RedHat/CentOS/Fedora | Remove Elasticsearch repository (and clean up left-over metadata)
  yum_repository:
-    name: elastic_repo
+    name: elastic_repo_7
    state: absent
  changed_when: false
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
@ -4,8 +4,8 @@
  yum_repository:
    name: elastic_repo_7
    description: Elastic repository for 7.x packages
-    baseurl: https://artifacts.elastic.co/packages/7.x/yum
-    gpgkey: https://artifacts.elastic.co/GPG-KEY-elasticsearch
+    baseurl: "{{ elasticrepo.yum }}"
+    gpgkey: "{{ elasticrepo.gpg }}"
    gpgcheck: true
  changed_when: false

--- a/roles/elastic-stack/ansible-kibana/defaults/main.yml
+++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@ -9,8 +9,10 @@ elastic_stack_version: 7.5.1
 wazuh_version: 3.11.1
 wazuh_app_url: https://packages.wazuh.com/wazuhapp/wazuhapp

-elasticrepo_server: https://artifacts.elastic.co/packages/7.x/apt
-elasticrepo_gpg_keyserver: pool.sks-keyservers.net
+elasticrepo:
+  apt: 'https://artifacts.elastic.co/packages/7.x/apt'
+  yum: 'https://artifacts.elastic.co/packages/7.x/yum'
+  gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'

 # API credentials
 wazuh_api_credentials:
--- a/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/Debian.yml
@ -10,13 +10,13 @@

 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
  apt_key:
-    url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
+    url: "{{ elasticrepo.gpg }}"
    id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
    state: present

 - name: Debian/Ubuntu | Install Elastic repo
  apt_repository:
-    repo: "deb {{ elasticrepo_server }} stable main"
+    repo: "deb {{ elasticrepo.apt }} stable main"
    state: present
    filename: 'elastic_repo_7'
    update_cache: true
--- a/roles/elastic-stack/ansible-kibana/tasks/RMDebian.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/RMDebian.yml
@ -1,6 +1,6 @@
 ---
 - name: Debian/Ubuntu | Removing Elasticsearch repository
  apt_repository:
-    repo: deb https://artifacts.elastic.co/packages/7.x/apt stable main
+    repo: "deb {{ elasticrepo.apt }} stable main"
    state: absent
  changed_when: false
--- a/roles/elastic-stack/ansible-kibana/tasks/RMRedHat.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/RMRedHat.yml
@ -1,6 +1,6 @@
 ---
 - name: Remove Elasticsearch repository (and clean up left-over metadata)
  yum_repository:
-    name: elastic_repo
+    name: elastic_repo_7
    state: absent
  changed_when: false
--- a/roles/elastic-stack/ansible-kibana/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-kibana/tasks/RedHat.yml
@ -3,8 +3,8 @@
  yum_repository:
    name: elastic_repo_7
    description: Elastic repository for 7.x packages
-    baseurl: https://artifacts.elastic.co/packages/7.x/yum
-    gpgkey: https://artifacts.elastic.co/GPG-KEY-elasticsearch
+    baseurl: "{{ elasticrepo.yum }}"
+    gpgkey: "{{ elasticrepo.gpg }}"
    gpgcheck: true
  changed_when: false

--- a/roles/wazuh/ansible-filebeat/defaults/main.yml
+++ b/roles/wazuh/ansible-filebeat/defaults/main.yml
@ -49,5 +49,7 @@ master_certs_path: /es_certs
 generate_CA: true
 ca_cert_name: ""

-elasticrepo_gpg_keyserver: pool.sks-keyservers.net
-elasticrepo_server: https://artifacts.elastic.co/packages/7.x/apt
+elasticrepo:
+  apt: 'https://artifacts.elastic.co/packages/7.x/apt'
+  yum: 'https://artifacts.elastic.co/packages/7.x/yum'
+  gpg: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
--- a/roles/wazuh/ansible-filebeat/tasks/Debian.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/Debian.yml
@ -10,13 +10,13 @@

 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
  apt_key:
-    url: "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
+    url: "{{ elasticrepo.gpg }}"
    id: 46095ACC8548582C1A2699A9D27D666CD88E42B4
    state: present

 - name: Debian/Ubuntu | Add Filebeat repository.
  apt_repository:
-    repo: "deb {{ elasticrepo_server }} stable main"
+    repo: "deb {{ elasticrepo.apt }} stable main"
    state: present
    update_cache: true
  changed_when: false
--- a/roles/wazuh/ansible-filebeat/tasks/RMDebian.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/RMDebian.yml
@ -1,6 +1,6 @@
 ---
 - name: Debian/Ubuntu | Remove Filebeat repository (and clean up left-over metadata)
  apt_repository:
-    repo: deb https://artifacts.elastic.co/packages/7.x/apt stable main
+    repo: "deb {{ elasticrepo.apt }} stable main"
    state: absent
  changed_when: false
--- a/roles/wazuh/ansible-filebeat/tasks/RMRedHat.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/RMRedHat.yml
@ -1,6 +1,6 @@
 ---
 - name: RedHat/CentOS/Fedora | Remove Filebeat repository (and clean up left-over metadata)
  yum_repository:
-    name: elastic_repo
+    name: elastic_repo_7
    state: absent
  changed_when: false
--- a/roles/wazuh/ansible-filebeat/tasks/RedHat.yml
+++ b/roles/wazuh/ansible-filebeat/tasks/RedHat.yml
@ -1,9 +1,9 @@
 ---
 - name: RedHat/CentOS/Fedora/Amazon Linux | Install Filebeats repo
  yum_repository:
-    name: elastic_repo
-    description: Elastic repository for 6.x packages
-    baseurl: https://artifacts.elastic.co/packages/7.x/yum
-    gpgkey: https://artifacts.elastic.co/GPG-KEY-elasticsearch
+    name: elastic_repo_7
+    description: Elastic repository for 7.x packages
+    baseurl: "{{ elasticrepo.yum }}"
+    gpgkey: "{{ elasticrepo.gpg }}"
    gpgcheck: true
  changed_when: false