Update Glance-nfs plugin to 2.0.0 for Fuel 6.1 compatibility

Change-Id: Ic5f3da4cfb3c8ae005089a4d61262f144ea492dd
This commit is contained in:
Lnic 2015-07-03 10:01:05 +02:00
parent d23b62cec4
commit 68b6638bb6
4 changed files with 41 additions and 25 deletions

View File

@ -16,7 +16,7 @@ Requirements
| Requirement | Version/Comment |
|----------------------------------|---------------------------------------------------------|
| Mirantis Openstack compatibility | 6.0 |
| Mirantis Openstack compatibility | 6.1 |
| NFS Server | an NFS server with volume accessible from compute nodes |
Recommendations
@ -48,18 +48,21 @@ Glance-nfs plugin installation
``fpb --build fuel-plugin-glance-nfs/``
4. The glance_nfs-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-glance-nfs)
4. The glance_nfs-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-glance-nfs)
5. Move this file to the Fuel Master node with secure copy (scp):
``scp glance_nfs-<x.x.x>.fp root@:<the_Fuel_Master_node_IP address>:/tmp``
``scp glance_nfs-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
``cd /tmp``
6. Install the glance-nfs plugin:
``fuel plugins --install glance_nfs-<x.x.x>.fp``
``fuel plugins --install glance_nfs-<x.x.x>.rpm``
6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
7. Verify that the plugin is installed correctly:
``fuel plugins --list``
8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
User Guide
==========
@ -102,5 +105,9 @@ Release Notes
* Initial release of the plugin
**2.0.0**
* Update plugin to Fuel 6.1 release

View File

@ -3,7 +3,13 @@ $nfs_volume_for_glance,
$nfs_mount_point_glance,
){
include glance_nfs::params
# have to find a better way to do this, if we can execute plugin before upload_cirros task we don't need this anymore
exec{ "image-delete":
command => "/bin/bash -c 'source /root/openrc && /usr/bin/glance image-delete TestVM | exit 0'",
before => Package["$glance_nfs::params::package_name"],
}
# Install package and start services
package { $glance_nfs::params::package_name:
ensure => present,
@ -36,7 +42,7 @@ $nfs_mount_point_glance,
# Create Mount Point
exec{ "/bin/mkdir -p $nfs_mount_point_glance":
unless => "/usr/bin/test -d $nfs_mount_point_glance",
before => mount["$nfs_mount_point_glance"],
before => Mount["$nfs_mount_point_glance"],
}
@ -69,4 +75,8 @@ $nfs_mount_point_glance,
notify => Service["$::glance_nfs::params::service_name"],
}
exec{ "/usr/bin/ruby /etc/puppet/modules/osnailyfacter/modular/astute/upload_cirros.rb":
require => Exec["/bin/chmod 775 ${$nfs_mount_point_glance}/images"],
}
}

View File

@ -2,34 +2,32 @@
name: glance_nfs
title: Glance NFS plugin
# Plugin version
version: 1.0.0
version: 2.0.0
# Description
description: Enables Glance to use NFS volume as storage backend for images
# Required fuel version
fuel_version: ['6.0']
fuel_version: ['6.1']
# Specify license of your plugin
licenses: ['Apache License Version 2.0']
# Specify author or company name
authors: ['Orange']
# A link to the plugin's page
homepage: 'https://github.com/stackforge/fuel-plugin-glance-nfs'
# Specify a group which your plugin implements, possible options:
# network, storage, storage::cinder, storage::glance, hypervisor
groups: ['storage::glance']
# The plugin is compatible with releases in the list
releases:
- os: ubuntu
version: 2014.2-6.0
version: 2014.2.2-6.1
mode: ['ha', 'multinode']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
- os: centos
version: 2014.2-6.0
version: 2014.2.2-6.1
mode: ['ha', 'multinode']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/centos
- os: ubuntu
version: 2014.2-6.0.1
mode: ['ha', 'multinode']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
- os: centos
version: 2014.2-6.0.1
mode: ['ha', 'multinode']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/centos
# Version of plugin package
package_version: '1.0.0'
package_version: '2.0.0'

View File

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