Changes to manage the agent target

Changed way to start and stop monasca-agent to take into
account that now it's a systemd target and not a service.
Improved cleanup to take care of all the installed files.

Task: 19584
Story: 2000975

Change-Id: I9420171623f288873fa263f5bc87560629391ea5
This commit is contained in:
Stefano Canepa 2018-05-06 21:20:17 +01:00
parent 2e078cdd87
commit 5effcebd92
1 changed files with 13 additions and 2 deletions

View File

@ -185,7 +185,12 @@ function start_monasca_services {
fi
if is_service_enabled monasca-agent; then
sudo /usr/local/bin/monasca-reconfigure
start_service monasca-agent || restart_service monasca-agent
if [ -f /etc/systemd/system/monasca-agent.target ]; then
start_service monasca-agent.target || restart_service monasca-agent.target
fi
if [ -f /etc/systemd/system/monasca-agent.service ]; then
start_service monasca-agent.service || restart_service monasca-agent.service
fi
fi
}
@ -208,7 +213,8 @@ function delete_kafka_topics {
function unstack_monasca {
stop_service grafana-server || true
stop_service monasca-agent || true
[[ -f /etc/systemd/system/monasca-agent.target ]] && stop_service monasca-agent.target || true
[[ -f /etc/systemd/system/monasca-agent.service ]] && stop_service monasca-agent.service || true
stop_service monasca-thresh || true
@ -1161,6 +1167,11 @@ function clean_monasca_agent {
sudo rm -rf /opt/monasca-agent
[[ -f /etc/systemd/system/monasca-agent.target ]] && sudo rm /etc/systemd/system/monasca-agent.target
[[ -f /etc/systemd/system/monasca-collector.service ]] && sudo rm /etc/systemd/system/monasca-collector.service
[[ -f /etc/systemd/system/monasca-forwarder.service ]] && sudo rm /etc/systemd/system/monasca-forwarder.service
[[ -f /etc/systemd/system/monasca-statsd.service ]] && sudo rm /etc/systemd/system/monasca-statsd.service
apt_get -y purge libxslt1-dev
apt_get -y purge libxml2-dev
apt_get -y purge python-yaml