summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLnic <loic.nicolle@orange.com>2015-07-03 10:01:05 +0200
committerLnic <loic.nicolle@orange.com>2015-07-03 10:30:26 +0200
commit68b6638bb6714bcdc0bb78b68a18834b21d4bf30 (patch)
tree980216d71cd88dc69667d8e6c076b0702816e2ee
parentd23b62cec403aebc47a52b133722c1b6ffb84385 (diff)
Update Glance-nfs plugin to 2.0.0 for Fuel 6.1 compatibility
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Samuel BARTEL <samuel.bartel@orange.com> Workflow+1: Samuel BARTEL <samuel.bartel@orange.com> Submitted-by: Jenkins Submitted-at: Fri, 03 Jul 2015 08:44:59 +0000 Reviewed-on: https://review.openstack.org/198261 Project: stackforge/fuel-plugin-glance-nfs Branch: refs/heads/master
-rw-r--r--README.md17
-rw-r--r--deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp14
-rw-r--r--metadata.yaml30
-rw-r--r--tasks.yaml5
4 files changed, 41 insertions, 25 deletions
diff --git a/README.md b/README.md
index be66ebc..a2f1d42 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Requirements
16 16
17| Requirement | Version/Comment | 17| Requirement | Version/Comment |
18|----------------------------------|---------------------------------------------------------| 18|----------------------------------|---------------------------------------------------------|
19| Mirantis Openstack compatibility | 6.0 | 19| Mirantis Openstack compatibility | 6.1 |
20| NFS Server | an NFS server with volume accessible from compute nodes | 20| NFS Server | an NFS server with volume accessible from compute nodes |
21 21
22Recommendations 22Recommendations
@@ -48,18 +48,21 @@ Glance-nfs plugin installation
48 48
49 ``fpb --build fuel-plugin-glance-nfs/`` 49 ``fpb --build fuel-plugin-glance-nfs/``
50 50
514. The glance_nfs-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-glance-nfs) 514. The glance_nfs-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-glance-nfs)
52 52
535. Move this file to the Fuel Master node with secure copy (scp): 535. 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 ``cd /tmp`` 56 ``cd /tmp``
57 57
586. Install the glance-nfs plugin: 586. 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
626. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI. 627. Verify that the plugin is installed correctly:
63 ``fuel plugins --list``
64
658. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
63 66
64User Guide 67User Guide
65========== 68==========
@@ -102,5 +105,9 @@ Release Notes
102 105
103* Initial release of the plugin 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
diff --git a/deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp b/deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp
index 87ef9dc..5c8ae12 100644
--- a/deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp
+++ b/deployment_scripts/puppet/modules/glance_nfs/manifests/init.pp
@@ -3,7 +3,13 @@ $nfs_volume_for_glance,
3$nfs_mount_point_glance, 3$nfs_mount_point_glance,
4){ 4){
5 include glance_nfs::params 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 # Install package and start services 13 # Install package and start services
8 package { $glance_nfs::params::package_name: 14 package { $glance_nfs::params::package_name:
9 ensure => present, 15 ensure => present,
@@ -36,7 +42,7 @@ $nfs_mount_point_glance,
36 # Create Mount Point 42 # Create Mount Point
37 exec{ "/bin/mkdir -p $nfs_mount_point_glance": 43 exec{ "/bin/mkdir -p $nfs_mount_point_glance":
38 unless => "/usr/bin/test -d $nfs_mount_point_glance", 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 notify => Service["$::glance_nfs::params::service_name"], 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}
diff --git a/metadata.yaml b/metadata.yaml
index 30c846d..3cb02da 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,34 +2,32 @@
2name: glance_nfs 2name: glance_nfs
3title: Glance NFS plugin 3title: Glance NFS plugin
4# Plugin version 4# Plugin version
5version: 1.0.0 5version: 2.0.0
6# Description 6# Description
7description: Enables Glance to use NFS volume as storage backend for images 7description: Enables Glance to use NFS volume as storage backend for images
8# Required fuel version 8# Required fuel version
9fuel_version: ['6.0'] 9fuel_version: ['6.1']
10# Specify license of your plugin
11licenses: ['Apache License Version 2.0']
12# Specify author or company name
13authors: ['Orange']
14# A link to the plugin's page
15homepage: '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
18groups: ['storage::glance']
10 19
11# The plugin is compatible with releases in the list 20# The plugin is compatible with releases in the list
12releases: 21releases:
13 - os: ubuntu 22 - os: ubuntu
14 version: 2014.2-6.0 23 version: 2014.2.2-6.1
15 mode: ['ha', 'multinode'] 24 mode: ['ha', 'multinode']
16 deployment_scripts_path: deployment_scripts/ 25 deployment_scripts_path: deployment_scripts/
17 repository_path: repositories/ubuntu 26 repository_path: repositories/ubuntu
18 - os: centos 27 - os: centos
19 version: 2014.2-6.0 28 version: 2014.2.2-6.1
20 mode: ['ha', 'multinode'] 29 mode: ['ha', 'multinode']
21 deployment_scripts_path: deployment_scripts/ 30 deployment_scripts_path: deployment_scripts/
22 repository_path: repositories/centos 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# Version of plugin package 32# Version of plugin package
35package_version: '1.0.0' 33package_version: '2.0.0'
diff --git a/tasks.yaml b/tasks.yaml
index 5405ea8..14ff9fb 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,6 +1,7 @@
1# This task is required for controller nodes 1# This task is required for controller nodes
2- role: ['controller'] 2- role: ['primary-controller', 'controller']
3 stage: post_deployment 3 stage: post_deployment/700
4 required_for: [upload_cirros]
4 type: puppet 5 type: puppet
5 parameters: 6 parameters:
6 puppet_manifest: puppet/site.pp 7 puppet_manifest: puppet/site.pp