Remove multibackend option from plugin
As Cinder is deprecating the use of the DEFAULT stanza for driver definitions and moving every driver to its own stanza we are going to force multibacked to be true and therefore removing the option from the GUI and all other references to it. Change-Id: I70bf4ad5c428ec0e0de3322f4da8680b54924d65
This commit is contained in:
parent
26dd95d2c4
commit
922547e57c
|
@ -14,13 +14,9 @@
|
|||
# under the License.
|
||||
#
|
||||
$plugin_settings = hiera('fuel-plugin-purestorage-cinder')
|
||||
$backend_name = 'pure'
|
||||
$previous_backends = ''
|
||||
|
||||
class { 'plugin_purestorage_cinder::controller' :
|
||||
backend_name => $backend_name,
|
||||
backends => $previous_backends,
|
||||
multibackend => $plugin_settings['multibackend'],
|
||||
section => 'pure',
|
||||
glance_image_cache => $plugin_settings['pure_glance_image_cache'],
|
||||
glance_image_count => $plugin_settings["pure_glance_cache_count"],
|
||||
glance_image_size => $plugin_settings["pure_glance_cache_size"],
|
||||
|
|
|
@ -14,9 +14,7 @@
|
|||
#
|
||||
|
||||
class plugin_purestorage_cinder::controller (
|
||||
$backend_name,
|
||||
$backends,
|
||||
$multibackend,
|
||||
$section,
|
||||
$glance_image_cache,
|
||||
$glance_image_count,
|
||||
$glance_image_size,
|
||||
|
@ -58,6 +56,16 @@ class plugin_purestorage_cinder::controller (
|
|||
include ::cinder::client
|
||||
include ::keystone::client
|
||||
|
||||
ini_subsetting {'enable_cinder_pure_backend':
|
||||
ensure => present,
|
||||
section => 'DEFAULT',
|
||||
key_val_separator => '=',
|
||||
path => '/etc/cinder/cinder.conf',
|
||||
setting => 'enabled_backends',
|
||||
subsetting => "${section}",
|
||||
subsetting_separator => ',',
|
||||
}
|
||||
|
||||
package {"purestorage":
|
||||
ensure => "installed",
|
||||
provider => pip
|
||||
|
@ -70,18 +78,14 @@ class plugin_purestorage_cinder::controller (
|
|||
Package[$::cinder::params::volume_package] -> Cinder_config<||>
|
||||
}
|
||||
|
||||
if $multibackend{
|
||||
$section = $backend_name
|
||||
cinder_type {'pure_vol':
|
||||
ensure => present,
|
||||
properties => ['volume_backend_name=$section'],
|
||||
}
|
||||
cinder_config {
|
||||
"DEFAULT/default_volume_type": value => 'pure_vol';
|
||||
"DEFAULT/enabled_backends": value => "${backend_name}";
|
||||
}
|
||||
} else {
|
||||
$section = 'DEFAULT'
|
||||
# $section = $backend_name
|
||||
cinder_type {'pure_vol':
|
||||
ensure => present,
|
||||
properties => ['volume_backend_name=pure'],
|
||||
}
|
||||
cinder_config {
|
||||
"DEFAULT/default_volume_type": value => 'pure_vol';
|
||||
# "DEFAULT/enabled_backends": value => "${section}";
|
||||
}
|
||||
|
||||
if $glance_image_cache{
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 83 KiB After Width: | Height: | Size: 101 KiB |
|
@ -1,12 +1,6 @@
|
|||
attributes:
|
||||
metadata:
|
||||
group: 'storage'
|
||||
multibackend:
|
||||
value: true
|
||||
label: 'Multi-backend enabled'
|
||||
description: 'Pure Storage will be used in a multi-backend environment'
|
||||
weight: 10
|
||||
type: "checkbox"
|
||||
pure_cg:
|
||||
value: "false"
|
||||
values:
|
||||
|
|
|
@ -7,7 +7,7 @@ licenses: ['Apache License Version 2.0']
|
|||
authors: ['Simon Dodsley <simon@purestorage.com>']
|
||||
homepage: 'https://github.com/openstack/fuel-plugin-purestorage-cinder'
|
||||
groups: ['storage::cinder']
|
||||
is_hotpluggable: false
|
||||
is_hotpluggable: true
|
||||
|
||||
releases:
|
||||
- os: ubuntu
|
||||
|
|
Loading…
Reference in New Issue