From 2d6c8fb9cefc459fb0c5c6c1e0b7e2aa53f72afa Mon Sep 17 00:00:00 2001
From: Emmanuel Cohen <emmanuel@hexack.fr>
Date: Wed, 2 Sep 2020 12:06:55 +0200
Subject: [PATCH] Fix package dependencies for mediaserver, refs #32662
---
playbooks/bench.yml | 11 ++++++-----
requirements.yml | 2 +-
roles/elastic/meta/main.yml | 5 -----
roles/mediaserver/defaults/main.yml | 9 +++++++--
roles/metricbeat/tasks/main.yml | 6 ++++++
5 files changed, 20 insertions(+), 13 deletions(-)
delete mode 100644 roles/elastic/meta/main.yml
diff --git a/playbooks/bench.yml b/playbooks/bench.yml
index 86678fba..a1fe065a 100755
--- a/playbooks/bench.yml
+++ b/playbooks/bench.yml
@@ -9,7 +9,7 @@
msg: "Benchmark server must be unique"
when: groups['bench_server'] | length > 1
tags: bench_server
- roles:
+ roles:
- bench-server
tasks:
- name: restart bench-server
@@ -21,7 +21,7 @@
- name: DEPLOY BENCHMARK WORKERS
hosts: bench_worker
tags: bench_worker
- roles:
+ roles:
- bench-worker
tasks:
- name: restart bench-worker
@@ -32,18 +32,19 @@
- name: DEPLOY ELASTIC KIBANA SERVER
hosts: elastic
+ tags: [ 'never', 'monbench' ]
vars:
- es_heap_size: 2g
- es_config:
- network.host: '{{ hostvars[groups['elastic'][0]]['ansible_default_ipv4']['address'] }}'
+ network.host: "{{ hostvars[groups['elastic'][0]]['ansible_default_ipv4']['address'] }}"
node.data: true
node.master: true
- cluster.initial_master_nodes: '{{ hostvars[groups["elastic"][0]].ansible_hostname }}'
+ cluster.initial_master_nodes: "{{ hostvars[groups['elastic'][0]].ansible_hostname }}"
- kibana_server_host: "{{ hostvars[groups['elastic'][0]]['ansible_default_ipv4']['address'] }}"
- elastic_host: "{{ es_config['network.host'] }}"
- es_api_host: "{{ es_config['network.host'] }}"
- tags: [ 'never', 'monbench' ]
roles:
+ - elastic.elasticsearch
- elastic
- name: DEPLOY METRICBEAT WORKERS
diff --git a/requirements.yml b/requirements.yml
index 5f526400..6b1fe055 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,5 +1,5 @@
---
- src: elastic.elasticsearch
- version: 7.8.1
+ version: 7.9.0
...
diff --git a/roles/elastic/meta/main.yml b/roles/elastic/meta/main.yml
deleted file mode 100644
index f4b7b68e..00000000
--- a/roles/elastic/meta/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-dependencies:
- - role: elastic.elasticsearch
-
-...
diff --git a/roles/mediaserver/defaults/main.yml b/roles/mediaserver/defaults/main.yml
index f2a97c3e..20a34338 100644
--- a/roles/mediaserver/defaults/main.yml
+++ b/roles/mediaserver/defaults/main.yml
@@ -1,9 +1,14 @@
---
server_packages:
- - ubicast-mediaserver
- - ubicast-mediaserver-runtime
+ - ubicast-config
+ - postgresql-client
+ - cron
+ - memcached
+ - nginx
+ - postfix
- celerity-utils
+ - ubicast-mediaserver
server_mail: dev-mediaserver@ubicast.eu
server_default_email_sender: "noreply@{{ server_hostname }}"
diff --git a/roles/metricbeat/tasks/main.yml b/roles/metricbeat/tasks/main.yml
index 4f02198b..d6f40f46 100644
--- a/roles/metricbeat/tasks/main.yml
+++ b/roles/metricbeat/tasks/main.yml
@@ -35,4 +35,10 @@
when: "'postgres' in group_names"
notify: restart metricbeat
+- name: enable metricbeat client
+ systemd:
+ name: metricbeat
+ enabled: yes
+ state: started
+
...
--
GitLab