Browse Source

puppet lint, updated test plan and LICENS

7.0
Funs 3 years ago
parent
commit
4f9156849b

+ 1
- 2
LICENSE View File

@@ -186,7 +186,7 @@ Apache License
186 186
       same "printed page" as the copyright notice for easier
187 187
       identification within third-party archives.
188 188
 
189
-   Copyright {yyyy} {name of copyright owner}
189
+   Copyright 2016 Funs Kessen
190 190
 
191 191
    Licensed under the Apache License, Version 2.0 (the "License");
192 192
    you may not use this file except in compliance with the License.
@@ -199,4 +199,3 @@ Apache License
199 199
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200 200
    See the License for the specific language governing permissions and
201 201
    limitations under the License.
202
-

+ 7
- 19
deployment_scripts/puppet/modules/cinder_datera_config/manifests/cinder.pp View File

@@ -1,18 +1,6 @@
1
-#    Copyright 2016 Datera, Inc.
2 1
 #
3
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
4
-#    not use this file except in compliance with the License. You may obtain
5
-#    a copy of the License at
2
+# Configure the Datera driver in cinder
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
-
16 4
 class cinder_datera_config::cinder (
17 5
     $backend_name  = 'datera',
18 6
     $backends      = ''
@@ -32,18 +20,18 @@ class cinder_datera_config::cinder (
32 20
     if $plugin_settings['multibackend'] {
33 21
       $section = $backend_name
34 22
       cinder_config {
35
-        "DEFAULT/enabled_backends": value => "${backend_name},${backends}";
23
+        'DEFAULT/enabled_backends': value => "${backend_name},${backends}";
36 24
       }
37 25
     } else {
38 26
       $section = 'DEFAULT'
39 27
     }
40 28
 
41 29
     cinder_datera_config::backend::datera{ $section :
42
-      san_ip               => $plugin_settings['datera_mvip'],
43
-      san_login            => $plugin_settings['datera_admin_login'],
44
-      san_password         => $plugin_settings['datera_admin_password'],
45
-      datera_num_replicas  => $plugin_settings['datera_num_replicas'],
46
-      extra_options        => {}
30
+      san_ip              => $plugin_settings['datera_mvip'],
31
+      san_login           => $plugin_settings['datera_admin_login'],
32
+      san_password        => $plugin_settings['datera_admin_password'],
33
+      datera_num_replicas => $plugin_settings['datera_num_replicas'],
34
+      extra_options       => {}
47 35
     }
48 36
 
49 37
     Cinder_config<||>~> Service[cinder_volume]

+ 17
- 11
deployment_scripts/puppet/modules/cinder_datera_driver/manifests/cinder.pp View File

@@ -1,26 +1,32 @@
1
+
1 2
 notice('PLUGIN: cinder_datera_driver::cinder: cinder.pp')
2 3
 
4
+#
5
+# Installs the Datera cinder driver
6
+#
3 7
 class cinder_datera_driver::cinder {
4 8
     $version = hiera('fuel_version')
5
-
9
+    $file = '/usr/lib/python2.7/dist-packages/cinder/volume/drivers/datera.py'
6 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 13
     if($version == '7.0') {
9
-        file { "/usr/lib/python2.7/dist-packages/cinder/volume/drivers/datera.py":
10
-            mode => "0644",
11
-            owner => 'root',
12
-            group => 'root',
14
+        file { $file:
15
+            mode   => '0644',
16
+            owner  => 'root',
17
+            group  => 'root',
13 18
             source => 'puppet:///modules/cinder_datera_driver/7.0/datera.py',
14 19
         }
15 20
     } elsif ($version == '8.0') {
16
-        file { "/usr/lib/python2.7/dist-packages/cinder/volume/drivers/datera.py":
17
-            mode => "0644",
18
-            owner => 'root',
19
-            group => 'root',
21
+        file { $file:
22
+            mode   => '0644',
23
+            owner  => 'root',
24
+            group  => 'root',
20 25
             source => 'puppet:///modules/cinder_datera_driver/8.0/datera.py',
21 26
         }
22 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
 }
26 32
 class { 'cinder_datera_driver::cinder': }

BIN
doc/TestPlanForFuelPluginDateraCinder-1.0.0.docx View File


Loading…
Cancel
Save