starlingx
/
stx-puppet
Code Issues Proposed changes

Remove deprecated instance_backing from sysinv code 

instance_backing is no longer being used during configuration
and so the dead code is being removed.

This has a cascade effect. Other methods and validators no longer
are required.

This update methods have been retained, even though there is nothing
for them to update.

Change-Id: I76b0181a2a3dd7d7d6c8d8b686dd724ab269844d
Story: 2004764
Task: 30119
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-06-24 07:53:55 -05:00
parent 3b945772f4
commit 0b426c578e
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
puppet-manifests/src/modules/platform/manifests/worker.pp
View File

@ -39,38 +39,16 @@ class platform::worker::storage (
$final_pvs,
$lvm_global_filter = '[]',
$lvm_update_filter = '[]',
$instance_backing = 'image',
$images_rbd_pool = 'ephemeral',
$images_rbd_ceph_conf = '/etc/ceph/ceph.conf'
) {
$adding_pvs_str = join($adding_pvs,' ')
$removing_pvs_str = join($removing_pvs,' ')
$round_to_extent = false
# Ensure partitions update prior to local storage configuration
Class['::platform::partitions'] -> Class[$name]
case $instance_backing {
'image': {
$images_type = 'default'
$images_volume_group = absent
$round_to_extent = false
$local_monitor_state = 'disabled'
$images_rbd_pool_real = absent
$images_rbd_ceph_conf_real = absent
}
'remote': {
$images_type = 'rbd'
$images_volume_group = absent
$round_to_extent = false
$local_monitor_state = 'disabled'
$images_rbd_pool_real = $images_rbd_pool
$images_rbd_ceph_conf_real = $images_rbd_ceph_conf
}
default: {
fail("Unsupported instance backing: ${instance_backing}")
}
}
::platform::worker::storage::wipe_new_pv { $adding_pvs: }
::platform::worker::storage::wipe_pv_and_format { $removing_pvs: }