openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Updates for rocky 

- Replace git.openstack.org with opendev.org
- Update some documentation
- Move README.md to README.rst for better rendering
- Drop obsolete bootstrap.sh script

Change-Id: I3331a19d1106a817e3e25a6520a8c6c1dde338ff
This commit is contained in:
Lance Albertson 2019-12-05 11:40:15 -08:00 committed by Dr. Jens Harbott
parent a47fa16dd1
commit 2325d92071
6 changed files with 183 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Berksfile
View File

@ -1,14 +1,11 @@
source 'https://supermarket.chef.io'
%w(image identity common).each do |cookbook|
if Dir.exist?("../cookbook-openstack-#{cookbook}")
cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
%w(client -image -identity -common).each do |cookbook|
if Dir.exist?("../cookbook-openstack#{cookbook}")
cookbook "openstack#{cookbook}", path: "../cookbook-openstack#{cookbook}"
else
cookbook "openstack-#{cookbook}", git: "https://git.openstack.org/openstack/cookbook-openstack-#{cookbook}"
cookbook "openstack#{cookbook}", git: "https://opendev.org/openstack/cookbook-openstack#{cookbook}"
end
end
cookbook 'openstackclient',
git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
metadata

127
README.md
View File

@ -1,127 +0,0 @@
Team and repository tags
========================
[![Team and repository tags](http://governance.openstack.org/badges/cookbook-openstack-block-storage.svg)](http://governance.openstack.org/reference/tags/index.html)
<!-- Change things from this point on -->
![Chef OpenStack Logo](https://www.openstack.org/themes/openstack/images/project-mascots/Chef%20OpenStack/OpenStack_Project_Chef_horizontal.png)
Description
===========
Installs the OpenStack Block Storage service **Cinder** as part of the OpenStack
reference deployment Chef for OpenStack. The
https://github.com/openstack/openstack-chef contains documentation for
using this cookbook in the context of a full OpenStack deployment. Cinder is
currently installed from packages.
https://docs.openstack.org/cinder/latest/
Requirements
============
- Chef 12 or higher
- chefdk 0.9.0 or higher for testing (also includes berkshelf for cookbook
dependency resolution)
Platform
========
- ubuntu
- redhat
- centos
Cookbooks
=========
The following cookbooks are dependencies:
- 'apt', '~> 4.0'
- 'openstack-common', '>= 14.0.0'
- 'openstack-identity', '>= 14.0.0'
- 'openstack-image', '>= 14.0.0'
- 'openstackclient', '>= 0.1.0'
Attributes
==========
Please see the extensive inline documentation in `attributes/*.rb` for
descriptions of all the settable attributes for this cookbook.
Note that all attributes are in the `default['openstack']` "namespace"
The usage of attributes to generate the cinder.conf is decribed in the
openstack-common cookbook.
Recipes
=======
## openstack-block-storage::api
- Installs the cinder-api and sets up the cinder database
## openstack-block-storage::backup
- Installs the cinder-backup service
## openstack-block-storage::cinder-common
- Defines the common pieces of repeated code from the other recipes
## openstack-block-storage::client
- Install the cinder client packages
## openstack-block-storage::identity_registration
- Defines the cinder service/user/endpoints in keystone
## openstack-block-storage::scheduler
- Installs the cinder-scheduler service
## openstack-block-storage::volume
- Installs the cinder-volume service
## openstack-block-storage::volume_driver_lvm
- Configures lvm as the cinder storage backend
License and Author
==================
| | |
|:---------------------|:---------------------------------------------------|
| **Author** | Justin Shepherd (<justin.shepherd@rackspace.com>) |
| **Author** | Jason Cannavale (<jason.cannavale@rackspace.com>) |
| **Author** | Ron Pedde (<ron.pedde@rackspace.com>) |
| **Author** | Joseph Breu (<joseph.breu@rackspace.com>) |
| **Author** | William Kelly (<william.kelly@rackspace.com>) |
| **Author** | Darren Birkett (<darren.birkett@rackspace.co.uk>) |
| **Author** | Evan Callicoat (<evan.callicoat@rackspace.com>) |
| **Author** | Matt Ray (<matt@opscode.com>) |
| **Author** | Jay Pipes (<jaypipes@att.com>) |
| **Author** | John Dewey (<jdewey@att.com>) |
| **Author** | Abel Lopez (<al592b@att.com>) |
| **Author** | Sean Gallagher (<sean.gallagher@att.com>) |
| **Author** | Ionut Artarisi (<iartarisi@suse.cz>) |
| **Author** | David Geng (<gengjh@cn.ibm.com>) |
| **Author** | Salman Baset (<sabaset@us.ibm.com>) |
| **Author** | Chen Zhiwei (<zhiwchen@cn.ibm.com>) |
| **Author** | Mark Vanderwiel (<vanderwl@us.ibm.com>) |
| **Author** | Eric Zhou (<zyouzhou@cn.ibm.com>) |
| **Author** | Edwin Wang (<edwin.wang@cn.ibm.com>) |
| **Author** | Jan Klare (<j.klare@cloudbau.de>) |
| **Author** | Christoph Albers (<c.albers@x-ion.de>) |
| | |
| **Copyright** | Copyright (c) 2012, Rackspace US, Inc. |
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH |
| **Copyright** | Copyright (c) 2013-2015, IBM, Corp. |
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

167
README.rst Normal file
View File

@ -0,0 +1,167 @@
OpenStack Chef Cookbook - block-storage
=======================================
.. image:: https://governance.openstack.org/tc/badges/cookbook-openstack-block-storage.svg
:target: https://governance.openstack.org/reference/tags/index.html
Description
===========
Installs the OpenStack Block Storage service **Cinder** as part of the
OpenStack reference deployment Chef for OpenStack. The `OpenStack
chef-repo`_ contains documentation for using this cookbook in the
context of a full OpenStack deployment. Cinder is currently installed
from packages.
.. _OpenStack chef-repo: https://opendev.org/openstack/openstack-chef
https://docs.openstack.org/cinder/latest/
Requirements
============
- Chef 14 or higher
- chefdk 3.2.30 for testing (also includes berkshelf for cookbook
dependency resolution)
Platform
========
- ubuntu
- redhat
- centos
Cookbooks
=========
The following cookbooks are dependencies:
- 'apache2', '5.0.1'
- 'lvm'
- 'openstackclient'
- 'openstack-common', '>= 18.0.0'
- 'openstack-identity', '>= 18.0.0'
- 'openstack-image', '>= 18.0.0'
- 'selinux'
Attributes
==========
Please see the extensive inline documentation in ``attributes/*.rb`` for
descriptions of all the settable attributes for this cookbook.
Note that all attributes are in the ``default['openstack']`` "namespace"
The usage of attributes to generate the ``cinder.conf`` is described in the
openstack-common cookbook.
Recipes
=======
openstack-block-storage::api
----------------------------
- Installs the cinder-api and sets up the cinder database
openstack-block-storage::backup
-------------------------------
- Installs the cinder-backup service
openstack-block-storage::cinder-common
--------------------------------------
- Defines the common pieces of repeated code from the other recipes
openstack-block-storage::identity_registration
-----------------------------------------------
- Defines the cinder service/user/endpoints in keystone
openstack-block-storage::scheduler
----------------------------------
- Installs the cinder-scheduler service
openstack-block-storage::volume_driver_lvm
--------------------------------------------
- Configures lvm as the cinder storage backend
openstack-block-storage::volume
-------------------------------
- Installs the cinder-volume service
License and Author
==================
+-----------------+---------------------------------------------------+
| **Author** | Justin Shepherd (justin.shepherd@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jason Cannavale (jason.cannavale@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Ron Pedde (ron.pedde@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Joseph Breu (joseph.breu@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | William Kelly (william.kelly@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Darren Birkett (darren.birkett@rackspace.co.uk) |
+-----------------+---------------------------------------------------+
| **Author** | Evan Callicoat (evan.callicoat@rackspace.com) |
+-----------------+---------------------------------------------------+
| **Author** | Matt Ray (matt@opscode.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jay Pipes (jaypipes@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | John Dewey (jdewey@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | Abel Lopez (al592b@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | Sean Gallagher (sean.gallagher@att.com) |
+-----------------+---------------------------------------------------+
| **Author** | Ionut Artarisi (iartarisi@suse.cz) |
+-----------------+---------------------------------------------------+
| **Author** | David Geng (gengjh@cn.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Salman Baset (sabaset@us.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Chen Zhiwei (zhiwchen@cn.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Mark Vanderwiel (vanderwl@us.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Eric Zhou (zyouzhou@cn.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Edwin Wang (edwin.wang@cn.ibm.com) |
+-----------------+---------------------------------------------------+
| **Author** | Jan Klare (j.klare@cloudbau.de) |
+-----------------+---------------------------------------------------+
| **Author** | Christoph Albers (c.albers@x-ion.de) |
+-----------------+---------------------------------------------------+
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2012, Rackspace US, Inc. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2012-2013, AT&T Services, Inc. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2013, Opscode, Inc. |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH |
+-----------------+---------------------------------------------------+
| **Copyright** | Copyright (c) 2013-2015, IBM, Corp. |
+-----------------+---------------------------------------------------+
Licensed under the Apache License, Version 2.0 (the "License"); you may
not use this file except in compliance with the License. You may obtain
a copy of the License at
::
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

2
Rakefile
View File

@ -33,7 +33,7 @@ end
desc 'All-in-One Neutron build Infra using Common task'
task :integration do
# Use the common integration task
sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile)
sh %(wget -nv -t 3 -O Rakefile-Common https://opendev.org/openstack/cookbook-openstack-common/raw/branch/master/Rakefile)
load './Rakefile-Common'
Rake::Task['common_integration'].invoke
end

6
bootstrap.sh
View File

@ -1,6 +0,0 @@
#!/bin/bash -x
## This script is for installing all the needed packages on trusty to run the chef tests with 'chef exec rake'.
## It relies on the common bootstrap.sh from openstack/cookbook-openstack-common for installing common dependencies.
wget -nv -t 3 -O common-bootstrap.sh https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/bootstrap.sh
/bin/bash -x common-bootstrap.sh

15
metadata.rb
View File

@ -3,9 +3,16 @@ maintainer 'Chef OpenStack'
maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0'
description 'The OpenStack Advanced Volume Management service Cinder.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '18.0.0'
recipe 'api', 'Installs the cinder-api and sets up the cinder database'
recipe 'backup', 'Installs the cinder-backup service'
recipe 'cinder-common', 'Defines the common pieces of repeated code from the other recipes'
recipe 'identity_registration', 'Defines the cinder service/user/endpoints in keystone'
recipe 'scheduler', 'Installs the cinder-scheduler service'
recipe 'volume_driver_lvm', 'Configures lvm as the cinder storage backend'
recipe 'volume', 'Installs the cinder-volume service'
%w(ubuntu redhat centos).each do |os|
supports os
end
@ -19,6 +26,6 @@ depends 'apache2', '5.0.1'
depends 'lvm'
depends 'selinux'
issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
source_url 'https://github.com/openstack/cookbook-openstack-block-storage' if respond_to?(:source_url)
chef_version '>= 12.5' if respond_to?(:chef_version)
issues_url 'https://launchpad.net/openstack-chef'
source_url 'https://opendev.org/openstack/cookbook-openstack-block-storage'
chef_version '>= 14.0'