starlingx
/
config
Code Issues Proposed changes

Remove Docker Logical Volume in CGTS-VG. 

Do not add Docker Logical Volume in CGTS-VG at all if --kubernetes
option not specified for config_controller.  Will prevent hw lab
installs from failing.  VBox installs with --kubernetes will be
fine if disk size is appropriate, hw lab installs with --kubernetes
still need work.

Change-Id: I6f3f3620dd06bfa5fbc751f5ca84191c4195ced4
This commit is contained in:
Kevin Smith 2018-06-01 11:19:17 -04:00 committed by Jack Ding
parent dafa02b84d
commit a691d3f9bb
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
puppet-manifests/src/modules/platform/manifests/filesystem.pp
View File

@ -138,12 +138,16 @@ class platform::filesystem::docker::params (
class platform::filesystem::docker
inherits ::platform::filesystem::docker::params {
platform::filesystem { $lv_name:
lv_name => $lv_name,
lv_size => $lv_size,
mountpoint => $mountpoint,
fs_type => $fs_type,
fs_options => $fs_options
include ::platform::kubernetes::params
if $::platform::kubernetes::params::enabled {
platform::filesystem { $lv_name:
lv_name => $lv_name,
lv_size => $lv_size,
mountpoint => $mountpoint,
fs_type => $fs_type,
fs_options => $fs_options
}
}
}

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

@ -6368,19 +6368,17 @@ class ConductorManager(service.PeriodicService):
if kubernetes_config:
docker_lv_size = constants.KUBERNETES_DOCKER_STOR_SIZE
else:
docker_lv_size = constants.DEFAULT_DOCKER_STOR_SIZE
data = {
'name': constants.FILESYSTEM_NAME_DOCKER,
'size': docker_lv_size,
'logical_volume': constants.FILESYSTEM_LV_DICT[
constants.FILESYSTEM_NAME_DOCKER],
'replicated': False,
}
LOG.info("Creating FS:%s:%s %d" % (
data['name'], data['logical_volume'], data['size']))
self.dbapi.controller_fs_create(data)
data = {
'name': constants.FILESYSTEM_NAME_DOCKER,
'size': docker_lv_size,
'logical_volume': constants.FILESYSTEM_LV_DICT[
constants.FILESYSTEM_NAME_DOCKER],
'replicated': False,
}
LOG.info("Creating FS:%s:%s %d" % (
data['name'], data['logical_volume'], data['size']))
self.dbapi.controller_fs_create(data)
if (system_dc_role == constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER and
tsc.system_type != constants.TIS_AIO_BUILD):