starlingx/config
Code Issues Proposed changes

Fix sysinv audit of filesystems with k8s enabled

Browse Source 
With the --kubernetes option present when executing config_controller,
there are additional filesystems that need to be audited for changes in
size.

Add missing spaces around these filesystem device names so that the
lvdisplay command is correctly formatted.

Change-Id: I1e0e2b2fed35b5681833a92c799b511592ce41f0
Story: 2002876
Task: 26863
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2018-08-30 00:38:26 -04:00
parent 50a709b7d2
commit 51e231ad11
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysinv/sysinv/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv" SRC_DIR="sysinv"
TIS_PATCH_VER=285 TIS_PATCH_VER=286

4
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -9120,11 +9120,11 @@ class ConductorManager(service.PeriodicService):
'/dev/cgts-vg/img-conversions-lv ' \ '/dev/cgts-vg/img-conversions-lv ' \
'/dev/cgts-vg/scratch-lv ' \ '/dev/cgts-vg/scratch-lv ' \
'/dev/cgts-vg/extension-lv ' \ '/dev/cgts-vg/extension-lv ' \
'/dev/cgts-vg/gnocchi-lv' '/dev/cgts-vg/gnocchi-lv '
if kubernetes_config: if kubernetes_config:
lvdisplay_command = lvdisplay_command + '/dev/cgts-vg/docker-lv ' lvdisplay_command = lvdisplay_command + '/dev/cgts-vg/docker-lv '
lvdisplay_command = lvdisplay_command + '/dev/cgts-vg/etcd-lv' lvdisplay_command = lvdisplay_command + '/dev/cgts-vg/etcd-lv '
lvdisplay_command = lvdisplay_command + '/dev/cgts-vg/dockerdistribution-lv ' lvdisplay_command = lvdisplay_command + '/dev/cgts-vg/dockerdistribution-lv '
if (system_dc_role == constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER and if (system_dc_role == constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER and