diff --git a/ansible/molecule/default/tests/test_msmonitor.py b/ansible/molecule/default/tests/test_msmonitor.py index 4862b011b82eae0dffb955db0fd069c6eb5a562a..8f30248a222847628c502794bec6b1eeb0a94184 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 f6d42f374189b1a242e307ec7a70717452619f48..7bf69f6d805cf3546fb141802893a3919eb903e4 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 432624e44247eb5645da9b12015d4834a69323e4..43e0fa2dc1955b4d7c734583bff81178761b0631 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 cfc635fe9790b5e0fcbb9272e206f19ea0209689..8bb82b0ab66a34f5413ba7e045bccd1fe02ca01f 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 660aacfef87f3a47e9d0ba7e32ed92d47904013f..ec5e696b61cd9f8d6020a61ceb5671146a5f11ef 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 bc30887648a245f663e47ca1dbfe5daf30dd1546..579d01a41dd6287b9f189e5edba7744d40a6ac0d 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