Browse Source

Update Glance-nfs plugin to 2.0.0 for Fuel 6.1 compatibility

Change-Id: Ic5f3da4cfb3c8ae005089a4d61262f144ea492dd
changes/61/198261/1
Lnic 4 years ago
parent
commit
68b6638bb6
4 changed files with 41 additions and 25 deletions
  1. 12
    5
      README.md
  2. 12
    2
      deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp
  3. 14
    16
      metadata.yaml
  4. 3
    2
      tasks.yaml

+ 12
- 5
README.md View File

@@ -16,7 +16,7 @@ Requirements
16 16
 
17 17
 | Requirement                      | Version/Comment                                         |
18 18
 |----------------------------------|---------------------------------------------------------|
19
-| Mirantis Openstack compatibility | 6.0                                                     |
19
+| Mirantis Openstack compatibility | 6.1                                                    |
20 20
 | NFS Server                       | an NFS server with volume accessible from compute nodes |
21 21
 
22 22
 Recommendations
@@ -48,18 +48,21 @@ Glance-nfs plugin installation
48 48
 
49 49
    ``fpb --build fuel-plugin-glance-nfs/``
50 50
 
51
-4. The glance_nfs-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-glance-nfs)
51
+4. The glance_nfs-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-glance-nfs)
52 52
 
53 53
 5. Move this file to the Fuel Master node with secure copy (scp):
54 54
 
55
-   ``scp glance_nfs-<x.x.x>.fp root@:<the_Fuel_Master_node_IP address>:/tmp``
55
+   ``scp glance_nfs-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
56 56
    ``cd /tmp``
57 57
 
58 58
 6. Install the glance-nfs plugin:
59 59
 
60
-   ``fuel plugins --install glance_nfs-<x.x.x>.fp``
60
+   ``fuel plugins --install glance_nfs-<x.x.x>.rpm``
61 61
 
62
-6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
62
+7.  Verify that the plugin is installed correctly:
63
+   ``fuel plugins --list``
64
+   
65
+8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
63 66
 
64 67
 User Guide
65 68
 ==========
@@ -102,5 +105,9 @@ Release Notes
102 105
 
103 106
 * Initial release of the plugin
104 107
 
108
+**2.0.0**
109
+
110
+* Update plugin to Fuel 6.1 release
111
+
105 112
 
106 113
 

+ 12
- 2
deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp View File

@@ -3,7 +3,13 @@ $nfs_volume_for_glance,
3 3
 $nfs_mount_point_glance,
4 4
 ){
5 5
   include glance_nfs::params
6
-
6
+  
7
+  # have to find a better way to do this, if we can execute plugin before upload_cirros task we don't need this anymore 
8
+  exec{ "image-delete":
9
+  command		=> "/bin/bash -c 'source /root/openrc && /usr/bin/glance image-delete TestVM | exit 0'",
10
+  before 		=> Package["$glance_nfs::params::package_name"],
11
+  }
12
+  
7 13
   # Install package and start services
8 14
   package { $glance_nfs::params::package_name:
9 15
     ensure => present,
@@ -36,7 +42,7 @@ $nfs_mount_point_glance,
36 42
   # Create Mount Point
37 43
   exec{ "/bin/mkdir -p $nfs_mount_point_glance":
38 44
 	unless => "/usr/bin/test -d $nfs_mount_point_glance",
39
-	before => mount["$nfs_mount_point_glance"],
45
+	before => Mount["$nfs_mount_point_glance"],
40 46
   }
41 47
   
42 48
   
@@ -69,4 +75,8 @@ $nfs_mount_point_glance,
69 75
   notify => Service["$::glance_nfs::params::service_name"],
70 76
   }
71 77
 
78
+  exec{ "/usr/bin/ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb":
79
+  require => Exec["/bin/chmod 775 ${$nfs_mount_point_glance}/images"],
80
+  }
81
+
72 82
 }

+ 14
- 16
metadata.yaml View File

@@ -2,34 +2,32 @@
2 2
 name: glance_nfs
3 3
 title: Glance NFS plugin
4 4
 # Plugin version
5
-version: 1.0.0
5
+version: 2.0.0
6 6
 # Description
7 7
 description: Enables Glance to use NFS volume as storage backend for images
8 8
 # Required fuel version
9
-fuel_version: ['6.0']
9
+fuel_version: ['6.1']
10
+# Specify license of your plugin
11
+licenses: ['Apache License Version 2.0']
12
+# Specify author or company name
13
+authors: ['Orange']
14
+# A link to the plugin's page
15
+homepage: 'https://github.com/stackforge/fuel-plugin-glance-nfs'
16
+# Specify a group which your plugin implements, possible options:
17
+# network, storage, storage::cinder, storage::glance, hypervisor
18
+groups: ['storage::glance']
10 19
 
11 20
 # The plugin is compatible with releases in the list
12 21
 releases:
13 22
   - os: ubuntu
14
-    version: 2014.2-6.0
23
+    version: 2014.2.2-6.1
15 24
     mode: ['ha', 'multinode']
16 25
     deployment_scripts_path: deployment_scripts/
17 26
     repository_path: repositories/ubuntu
18 27
   - os: centos
19
-    version: 2014.2-6.0
28
+    version: 2014.2.2-6.1
20 29
     mode: ['ha', 'multinode']
21 30
     deployment_scripts_path: deployment_scripts/
22 31
     repository_path: repositories/centos
23
-  - os: ubuntu
24
-    version: 2014.2-6.0.1
25
-    mode: ['ha', 'multinode']
26
-    deployment_scripts_path: deployment_scripts/
27
-    repository_path: repositories/ubuntu
28
-  - os: centos
29
-    version: 2014.2-6.0.1
30
-    mode: ['ha', 'multinode']
31
-    deployment_scripts_path: deployment_scripts/
32
-    repository_path: repositories/centos
33
-
34 32
 # Version of plugin package
35
-package_version: '1.0.0'
33
+package_version: '2.0.0'

+ 3
- 2
tasks.yaml View File

@@ -1,6 +1,7 @@
1 1
 # This task is required for controller nodes
2
-- role: ['controller']
3
-  stage: post_deployment
2
+- role: ['primary-controller', 'controller']
3
+  stage: post_deployment/700
4
+  required_for: [upload_cirros]
4 5
   type: puppet
5 6
   parameters:
6 7
     puppet_manifest: puppet/site.pp

Loading…
Cancel
Save