Update puppet files with corrected syntax
Fixing bugs in the code to allow other people to access the latest codebase of this plugin Change-Id: I866447618da4b0aa3c89745e9832278d4ee7a569
This commit is contained in:
parent
feb15100e6
commit
200d8420f6
|
@ -1,4 +1,3 @@
|
|||
class: cinder::backend::pure
|
||||
#
|
||||
# Configures Cinder volume PureStorage driver.
|
||||
# Parameters are particular to each volume driver.
|
||||
|
@ -13,7 +12,7 @@ class: cinder::backend::pure
|
|||
#
|
||||
# [*volume_backend_name*]
|
||||
# (optional) Allows for the volume_backend_name to be separate of $name.
|
||||
# Defaults to: $name
|
||||
# Defaults to: $backend_name
|
||||
#
|
||||
# [*use_multipath_for_image_xfer*]
|
||||
# (optional) .
|
||||
|
@ -29,22 +28,22 @@ class: cinder::backend::pure
|
|||
# Example :
|
||||
# { 'pure_backend/param1' => { 'value' => value1 } }
|
||||
#
|
||||
define cinder::backend::pure(
|
||||
$san_ip,
|
||||
$pure_api_token,
|
||||
$volume_backend_name = $name,
|
||||
class plugin_purestorage_cinder::backend::pure(
|
||||
$san_ip = "",
|
||||
$pure_api_token = "",
|
||||
$volume_backend_name = $backend_name,
|
||||
$pure_use_chap = false,
|
||||
$use_multipath_for_image_xfer = true,
|
||||
$extra_options = {},
|
||||
) {
|
||||
|
||||
cinder_config {
|
||||
"${name}/volume_backend_name": value => $volume_backend_name;
|
||||
"${name}/volume_driver": value => $volume_driver;
|
||||
"${name}/san_ip": value => $san_ip;
|
||||
"${name}/pure_api_token": value => $pure_api_token, secret => true;
|
||||
"${name}/pure_use_chap": value => $pure_use_chap;
|
||||
"${name}/use_multipath_for_image_xfer": value => $use_multipath_for_image_xfer ;
|
||||
"${backend_name}/volume_backend_name": value => $volume_backend_name;
|
||||
"${backend_name}/volume_driver": value => $volume_driver;
|
||||
"${backend_name}/san_ip": value => $san_ip;
|
||||
"${backend_name}/pure_api_token": value => $pure_api_token, secret => true;
|
||||
"${backend_name}/pure_use_chap": value => $pure_use_chap;
|
||||
"${backend_name}/use_multipath_for_image_xfer": value => $use_multipath_for_image_xfer ;
|
||||
}
|
||||
|
||||
create_resources('cinder_config', $extra_options)
|
||||
|
|
|
@ -30,6 +30,7 @@ class plugin_purestorage_cinder::common {
|
|||
enable => true,
|
||||
hasrestart => true,
|
||||
require => Package[$plugin_purestorage_cinder::params::iscsi_package_name],
|
||||
}
|
||||
file {'99-pure-storage.rules':
|
||||
path => '/lib/udev/rules.d/99-pure-storage.rules',
|
||||
mode => '0644',
|
||||
|
|
|
@ -18,6 +18,8 @@ class plugin_purestorage_cinder::compute {
|
|||
include plugin_purestorage_cinder::common
|
||||
include ::nova::params
|
||||
|
||||
$plugin_settings = hiera('fuel-plugin-purestorage-cinder')
|
||||
|
||||
service { 'nova-compute':
|
||||
ensure => 'running',
|
||||
name => $::nova::params::compute_service_name,
|
||||
|
|
|
@ -19,13 +19,14 @@ class plugin_purestorage_cinder::controller (
|
|||
) {
|
||||
|
||||
include plugin_purestorage_cinder::common
|
||||
include plugin_purestorage_cinder::backend::pure
|
||||
include ::cinder::params
|
||||
include ::cinder::client
|
||||
|
||||
package {"purestorage":
|
||||
ensure => "installed",
|
||||
provider => pip
|
||||
)
|
||||
}
|
||||
|
||||
$plugin_settings = hiera('fuel-plugin-purestorage-cinder')
|
||||
|
||||
|
@ -45,7 +46,7 @@ class plugin_purestorage_cinder::controller (
|
|||
$section = 'DEFAULT'
|
||||
}
|
||||
|
||||
cinder::backend::pure { $section :
|
||||
plugin_purestorage_cinder::backend::pure { $section :
|
||||
san_ip => $plugin_settings['pure_san_ip'],
|
||||
pure_api_token => $plugin_settings['pure_api'],
|
||||
volume_backend_name => $section,
|
||||
|
|
|
@ -55,6 +55,7 @@ Pure Storage Cinder Plugin installation
|
|||
have the Fuel Master node yet, see Quick Start Guide
|
||||
|
||||
::
|
||||
|
||||
scp fuel-plugin-purestorage-cinder-1.0-1.0.0.noarch.rpm root@:<the_Fuel_Master_node_IP>:/tmp
|
||||
|
||||
3. Log into the Fuel Master node.
|
||||
|
|
|
@ -21,4 +21,4 @@ releases:
|
|||
repository_path: repositories/centos
|
||||
|
||||
# Version of plugin package
|
||||
package_version: '1.0.0'
|
||||
package_version: '2.0.0'
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
# Deployment tasks
|
||||
- role: [primary-controller, controller, cinder]
|
||||
stage: post_deployment/6000
|
||||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/controller.pp
|
||||
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
|
||||
timeout: 360
|
||||
|
||||
- role: [compute]
|
||||
stage: post_deployment/6001
|
||||
type: puppet
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/compute.pp
|
||||
puppet_modules: "puppet/modules/:/etc/puppet/modules/"
|
||||
timeout: 360
|
Loading…
Reference in New Issue