summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuns <funs@barred.org>2016-05-04 13:44:35 +0200
committerFuns <funs@barred.org>2016-05-04 13:44:35 +0200
commit4f9156849b7d33fcdf9b419b993aa1d49f87e057 (patch)
treece3a845927c72fafe0fdbe8fda68744fc5da5722
parent662ad31b55e05b8a3163b4f41f4979279fe75095 (diff)
puppet lint, updated test plan and LICENS
-rw-r--r--LICENSE3
-rwxr-xr-xdeployment_scripts/puppet/modules/cinder_datera_config/manifests/cinder.pp26
-rw-r--r--deployment_scripts/puppet/modules/cinder_datera_driver/manifests/cinder.pp28
-rw-r--r--doc/TestPlanForFuelPluginDateraCinder-1.0.0.docxbin18023 -> 16715 bytes
4 files changed, 25 insertions, 32 deletions
diff --git a/LICENSE b/LICENSE
index e06d208..111cf36 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@ Apache License
186 same "printed page" as the copyright notice for easier 186 same "printed page" as the copyright notice for easier
187 identification within third-party archives. 187 identification within third-party archives.
188 188
189 Copyright {yyyy} {name of copyright owner} 189 Copyright 2016 Funs Kessen
190 190
191 Licensed under the Apache License, Version 2.0 (the "License"); 191 Licensed under the Apache License, Version 2.0 (the "License");
192 you may not use this file except in compliance with the License. 192 you may not use this file except in compliance with the License.
@@ -199,4 +199,3 @@ Apache License
199 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 199 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200 See the License for the specific language governing permissions and 200 See the License for the specific language governing permissions and
201 limitations under the License. 201 limitations under the License.
202
diff --git a/deployment_scripts/puppet/modules/cinder_datera_config/manifests/cinder.pp b/deployment_scripts/puppet/modules/cinder_datera_config/manifests/cinder.pp
index 277eb91..bb13aca 100755
--- a/deployment_scripts/puppet/modules/cinder_datera_config/manifests/cinder.pp
+++ b/deployment_scripts/puppet/modules/cinder_datera_config/manifests/cinder.pp
@@ -1,18 +1,6 @@
1# Copyright 2016 Datera, Inc.
2# 1#
3# Licensed under the Apache License, Version 2.0 (the "License"); you may 2# Configure the Datera driver in cinder
4# not use this file except in compliance with the License. You may obtain
5# a copy of the License at
6# 3#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# License for the specific language governing permissions and limitations
13# under the License.
14#
15
16class cinder_datera_config::cinder ( 4class cinder_datera_config::cinder (
17 $backend_name = 'datera', 5 $backend_name = 'datera',
18 $backends = '' 6 $backends = ''
@@ -32,18 +20,18 @@ class cinder_datera_config::cinder (
32 if $plugin_settings['multibackend'] { 20 if $plugin_settings['multibackend'] {
33 $section = $backend_name 21 $section = $backend_name
34 cinder_config { 22 cinder_config {
35 "DEFAULT/enabled_backends": value => "${backend_name},${backends}"; 23 'DEFAULT/enabled_backends': value => "${backend_name},${backends}";
36 } 24 }
37 } else { 25 } else {
38 $section = 'DEFAULT' 26 $section = 'DEFAULT'
39 } 27 }
40 28
41 cinder_datera_config::backend::datera{ $section : 29 cinder_datera_config::backend::datera{ $section :
42 san_ip => $plugin_settings['datera_mvip'], 30 san_ip => $plugin_settings['datera_mvip'],
43 san_login => $plugin_settings['datera_admin_login'], 31 san_login => $plugin_settings['datera_admin_login'],
44 san_password => $plugin_settings['datera_admin_password'], 32 san_password => $plugin_settings['datera_admin_password'],
45 datera_num_replicas => $plugin_settings['datera_num_replicas'], 33 datera_num_replicas => $plugin_settings['datera_num_replicas'],
46 extra_options => {} 34 extra_options => {}
47 } 35 }
48 36
49 Cinder_config<||>~> Service[cinder_volume] 37 Cinder_config<||>~> Service[cinder_volume]
diff --git a/deployment_scripts/puppet/modules/cinder_datera_driver/manifests/cinder.pp b/deployment_scripts/puppet/modules/cinder_datera_driver/manifests/cinder.pp
index e254d2c..87ef29a 100644
--- a/deployment_scripts/puppet/modules/cinder_datera_driver/manifests/cinder.pp
+++ b/deployment_scripts/puppet/modules/cinder_datera_driver/manifests/cinder.pp
@@ -1,26 +1,32 @@
1
1notice('PLUGIN: cinder_datera_driver::cinder: cinder.pp') 2notice('PLUGIN: cinder_datera_driver::cinder: cinder.pp')
2 3
4#
5# Installs the Datera cinder driver
6#
3class cinder_datera_driver::cinder { 7class cinder_datera_driver::cinder {
4 $version = hiera('fuel_version') 8 $version = hiera('fuel_version')
5 9 $file = '/usr/lib/python2.7/dist-packages/cinder/volume/drivers/datera.py'
6 # install the driver, only required on cinder nodes 10 # install the driver, only required on cinder nodes
7 notice("PLUGIN: cinder_datera_driver::cinder: trying to install Fuel $version plugin.") 11 notice("PLUGIN: cinder_datera_driver::cinder: trying to install Fuel \
12 ${version} plugin.")
8 if($version == '7.0') { 13 if($version == '7.0') {
9 file { "/usr/lib/python2.7/dist-packages/cinder/volume/drivers/datera.py": 14 file { $file:
10 mode => "0644", 15 mode => '0644',
11 owner => 'root', 16 owner => 'root',
12 group => 'root', 17 group => 'root',
13 source => 'puppet:///modules/cinder_datera_driver/7.0/datera.py', 18 source => 'puppet:///modules/cinder_datera_driver/7.0/datera.py',
14 } 19 }
15 } elsif ($version == '8.0') { 20 } elsif ($version == '8.0') {
16 file { "/usr/lib/python2.7/dist-packages/cinder/volume/drivers/datera.py": 21 file { $file:
17 mode => "0644", 22 mode => '0644',
18 owner => 'root', 23 owner => 'root',
19 group => 'root', 24 group => 'root',
20 source => 'puppet:///modules/cinder_datera_driver/8.0/datera.py', 25 source => 'puppet:///modules/cinder_datera_driver/8.0/datera.py',
21 } 26 }
22 } else { 27 } else {
23 notice("PLUGIN: cinder_datera_driver::cinder: $version is not supported by us.") 28 notice("PLUGIN: cinder_datera_driver::cinder: ${version} is not \
29 supported by us.")
24 } 30 }
25} 31}
26class { 'cinder_datera_driver::cinder': } 32class { 'cinder_datera_driver::cinder': }
diff --git a/doc/TestPlanForFuelPluginDateraCinder-1.0.0.docx b/doc/TestPlanForFuelPluginDateraCinder-1.0.0.docx
index 5efbdf0..8c5d0da 100644
--- a/doc/TestPlanForFuelPluginDateraCinder-1.0.0.docx
+++ b/doc/TestPlanForFuelPluginDateraCinder-1.0.0.docx
Binary files differ