openstack
/
masakari
Code Issues Proposed changes

[DevStack] Do not use the sample process list 

... for the process monitor deployment.

That sample list manipulation was ugly and definitions there
did not really match the reality causing random hiccups in CI and
local DevStack deployments (mostly due to constant restarting of
instancemonitor).
Moreover, processmonitor is deprecated in Xena. [1]
The existing unit tests and the noop deployment should be enough
to keep it on the surface.

[1] https://review.opendev.org/c/openstack/masakari-monitors/+/806431

Change-Id: I1787206b1ca84b64686bfaa1d00f33dbfc2e3adb
This commit is contained in:
Radosław Piliszek 2021-08-27 17:21:06 +00:00
parent e76705c437
commit 25f64a0fdc
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
devstack/plugin.sh
View File

@ -188,21 +188,8 @@ function configure_masakarimonitors {
iniset $MASAKARI_MONITORS_CONF api project_domain_id "$SERVICE_DOMAIN_ID"
iniset $MASAKARI_MONITORS_CONF api region "$REGION_NAME"
iniset $MASAKARI_MONITORS_CONF process process_list_path "/etc/masakarimonitors/process_list.yaml"
cp $DEST/masakari-monitors/etc/masakarimonitors/process_list.yaml.sample \
$MASAKARI_MONITORS_CONF_DIR/process_list.yaml
sed -i 's/start nova-compute/start devstack@n-cpu/g' $MASAKARI_MONITORS_CONF_DIR/process_list.yaml
sed -i 's/restart nova-compute/restart devstack@n-cpu/g' $MASAKARI_MONITORS_CONF_DIR/process_list.yaml
sed -i 's/start masakari-instancemonitor/start devstack@masakari-instancemonitor/g' \
$MASAKARI_MONITORS_CONF_DIR/process_list.yaml
sed -i 's/restart masakari-instancemonitor/restart devstack@masakari-instancemonitor/g' \
$MASAKARI_MONITORS_CONF_DIR/process_list.yaml
# NOTE(neha-alhat): remove monitoring of host-monitor process as
# devstack support for host-monitor is not added yet.
sed -i '43,52d' $MASAKARI_MONITORS_CONF_DIR/process_list.yaml
iniset $MASAKARI_MONITORS_CONF process process_list_path "$MASAKARI_MONITORS_CONF_DIR/process_list.yaml"
touch $MASAKARI_MONITORS_CONF_DIR/process_list.yaml
}
# install_masakari() - Collect source and prepare