From 66786f44d5d0092f1093270771998980f9161189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 12 Mar 2021 11:22:19 +0100
Subject: [PATCH] Remove ubicast-config package | refs #33688
---
ansible/molecule/default/tests/test_msmonitor.py | 2 +-
ansible/playbooks/migrate-debian.yml | 2 +-
ansible/roles/mediaserver/defaults/main.yml | 1 -
ansible/roles/mirismanager/defaults/main.yml | 1 -
ansible/roles/msmonitor/tasks/main.yml | 6 ------
ansible/roles/sysconfig/tasks/main.yml | 4 ++--
6 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/ansible/molecule/default/tests/test_msmonitor.py b/ansible/molecule/default/tests/test_msmonitor.py
index 4862b011..8f30248a 100644
--- a/ansible/molecule/default/tests/test_msmonitor.py
+++ b/ansible/molecule/default/tests/test_msmonitor.py
@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_munin_is_installed(host):
- p = host.package("ubicast-config")
+ p = host.package("munin-node")
assert p.is_installed
diff --git a/ansible/playbooks/migrate-debian.yml b/ansible/playbooks/migrate-debian.yml
index f6d42f37..7bf69f6d 100755
--- a/ansible/playbooks/migrate-debian.yml
+++ b/ansible/playbooks/migrate-debian.yml
@@ -32,7 +32,7 @@
shell:
cmd: |
rm -f /root/ubicast-installed;
- for pkg in 'ubicast-mediaserver' 'ubicast-mediaserver-runtime' 'ubicast-monitor' 'ubicast-monitor-runtime' 'ubicast-skyreach' 'ubicast-skyreach-runtime' 'celerity-server' 'celerity-workers' 'ubicast-config'; do
+ for pkg in 'ubicast-mediaserver' 'ubicast-mediaserver-runtime' 'ubicast-monitor' 'ubicast-monitor-runtime' 'ubicast-skyreach' 'ubicast-skyreach-runtime' 'celerity-server' 'celerity-workers'; do
dpkg -s "$pkg" >/dev/null 2>&1 && echo -n "$pkg " | tee -a '/root/ubicast-installed';
echo '';
done
diff --git a/ansible/roles/mediaserver/defaults/main.yml b/ansible/roles/mediaserver/defaults/main.yml
index 432624e4..43e0fa2d 100644
--- a/ansible/roles/mediaserver/defaults/main.yml
+++ b/ansible/roles/mediaserver/defaults/main.yml
@@ -1,7 +1,6 @@
---
server_packages:
- - ubicast-config
- postgresql-client
- cron
- memcached
diff --git a/ansible/roles/mirismanager/defaults/main.yml b/ansible/roles/mirismanager/defaults/main.yml
index cfc635fe..8bb82b0a 100644
--- a/ansible/roles/mirismanager/defaults/main.yml
+++ b/ansible/roles/mirismanager/defaults/main.yml
@@ -7,7 +7,6 @@ dependencies_packages:
- nginx
- postfix
- postgresql
- - ubicast-config
manager_packages:
- ubicast-skyreach
diff --git a/ansible/roles/msmonitor/tasks/main.yml b/ansible/roles/msmonitor/tasks/main.yml
index 660aacfe..ec5e696b 100644
--- a/ansible/roles/msmonitor/tasks/main.yml
+++ b/ansible/roles/msmonitor/tasks/main.yml
@@ -1,11 +1,5 @@
---
-- name: munin install
- apt:
- force_apt_get: true
- install_recommends: false
- name: ubicast-config
-
- name: monitor install
apt:
force_apt_get: true
diff --git a/ansible/roles/sysconfig/tasks/main.yml b/ansible/roles/sysconfig/tasks/main.yml
index bc308876..579d01a4 100644
--- a/ansible/roles/sysconfig/tasks/main.yml
+++ b/ansible/roles/sysconfig/tasks/main.yml
@@ -20,11 +20,11 @@
state: absent
purge: true
-- name: install ubicast-config
+- name: install unattended-upgrades
apt:
force_apt_get: true
install_recommends: false
- name: ubicast-config
+ name: unattended-upgrades
state: latest
- name: enable unattended upgrades
--
GitLab