Release Candidate #3 -- Fix for lvm type not created if nimble plugin is enabled
This commit is contained in:
parent
29c257f587
commit
fda70cb19e
Binary file not shown.
|
@ -20,7 +20,7 @@ $range_array = range("1", $no_backends)
|
|||
if ($cinder_nimble['nimble_grouping']) == true {
|
||||
$content = inline_template('
|
||||
storage:
|
||||
nimble_volume_backend_names:
|
||||
volume_backend_names:
|
||||
<%= @cinder_nimble["nimble_group_backend_type"] %>: <%= @cinder_nimble["nimble_group_backend_name"] %>
|
||||
nimble_encryption:
|
||||
<%= @cinder_nimble["nimble_group_backend_type"] %>: <%= @cinder_nimble["nimble_group_encryption"] -%>
|
||||
|
@ -35,7 +35,7 @@ storage:
|
|||
else {
|
||||
$content = inline_template('
|
||||
storage:
|
||||
nimble_volume_backend_names:
|
||||
volume_backend_names:
|
||||
<% @range_array.each do |i| -%>
|
||||
<%= @cinder_nimble["nimble#{i}_backend_type"] %>: <%= @cinder_nimble["nimble#{i}_backend_name"] %>
|
||||
<% end %>
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
class plugin_cinder_nimble::backend::set_nimble_cinder_type (
|
||||
) {
|
||||
$storage_hash = hiera_hash('storage', {})
|
||||
$backends = $storage_hash['nimble_volume_backend_names']
|
||||
$backends = $storage_hash['volume_backend_names']
|
||||
|
||||
$available_backends = delete_values($backends, false)
|
||||
$available_backend_names = keys($available_backends)
|
||||
|
||||
$unavailable_backends = delete($backends, $available_backend_names)
|
||||
$unavailable_backend_names = keys($unavailable_backends)
|
||||
|
||||
::osnailyfacter::openstack::manage_cinder_types { $available_backend_names:
|
||||
ensure => 'present',
|
||||
volume_backend_names => $available_backends,
|
||||
}
|
||||
::osnailyfacter::openstack::manage_cinder_types { $unavailable_backend_names:
|
||||
ensure => 'absent',
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue