Implementation of Cinder Block Device plugin
Change-Id: I5fd1dc10a1018ecf2f1f21f8550899320564dd75
This commit is contained in:
parent
b7b05cc44e
commit
76fce47802
|
@ -0,0 +1,202 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright {yyyy} {name of copyright owner}
|
||||
|
||||
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.
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
notice('MODULAR: block-device/cinder-block-device.pp')
|
||||
|
||||
prepare_network_config(hiera('network_scheme', {}))
|
||||
|
||||
$storage_address = get_network_role_property('cinder/iscsi', 'ipaddr')
|
||||
$management_vip = hiera('management_vip')
|
||||
$verbose = true
|
||||
$debug = hiera('debug', true)
|
||||
$nodes_hash = hiera('nodes', {})
|
||||
$glance_api_servers = hiera('glance_api_servers', "${management_vip}:9292")
|
||||
$storage_hash = hiera_hash('storage_hash', {})
|
||||
$rabbit_hash = hiera_hash('rabbit_hash', {})
|
||||
$cinder_hash = hiera_hash('cinder_hash', {})
|
||||
$ceilometer_hash = hiera_hash('ceilometer_hash',{})
|
||||
$queue_provider = hiera('queue_provider', 'rabbitmq')
|
||||
$service_endpoint = hiera('service_endpoint')
|
||||
$use_stderr = hiera('use_stderr', false)
|
||||
$use_syslog = hiera('use_syslog', true)
|
||||
$syslog_log_facility_cinder = hiera('syslog_log_facility_cinder', 'LOG_LOCAL3')
|
||||
$cinder_block_device = hiera_hash('cinder_block_device_driver')
|
||||
|
||||
$cinder_db_password = $cinder_hash[db_password]
|
||||
$cinder_db_user = pick($cinder_hash['db_user'], 'cinder')
|
||||
$cinder_db_name = pick($cinder_hash['db_name'], 'cinder')
|
||||
$cinder_block_device_scheme = parseyaml($cinder_block_device['block_device_scheme']['content'])
|
||||
$db_host = pick($cinder_hash['db_host'], hiera('database_vip'))
|
||||
$keystone_user = pick($cinder_hash['user'], 'cinder')
|
||||
$keystone_tenant = pick($cinder_hash['tenant'], 'services')
|
||||
$rabbit_user = pick($rabbit_hash['user'], 'nova')
|
||||
|
||||
$keystone_auth_protocol = 'http'
|
||||
$keystone_auth_host = $service_endpoint
|
||||
$service_port = '5000'
|
||||
$auth_uri = "${keystone_auth_protocol}://${keystone_auth_host}:${service_port}/"
|
||||
|
||||
$node = filter_nodes($nodes_hash, 'name', $::hostname)
|
||||
if empty($node) {
|
||||
fail("Node $::hostname is not defined in the hash structure")
|
||||
}
|
||||
|
||||
# TODO: openstack_version is confusing, there's such string var in hiera and hardcoded hash
|
||||
$hiera_openstack_version = hiera('openstack_version')
|
||||
$openstack_version = {
|
||||
'keystone' => 'installed',
|
||||
'glance' => 'installed',
|
||||
'horizon' => 'installed',
|
||||
'nova' => 'installed',
|
||||
'novncproxy' => 'installed',
|
||||
'cinder' => 'installed',
|
||||
}
|
||||
|
||||
$max_pool_size = min($::processorcount * 5 + 0, 30 + 0)
|
||||
$max_overflow = min($::processorcount * 5 + 0, 60 + 0)
|
||||
$max_retries = '-1'
|
||||
$idle_timeout = '3600'
|
||||
|
||||
Exec { logoutput => true }
|
||||
|
||||
include keystone::python
|
||||
package { 'python-amqp':
|
||||
ensure => present
|
||||
}
|
||||
|
||||
class { 'openstack::cinder':
|
||||
amqp_hosts => hiera('amqp_hosts',''),
|
||||
amqp_password => $rabbit_hash['password'],
|
||||
amqp_user => $rabbit_hash['user'],
|
||||
auth_uri => $auth_uri,
|
||||
bind_host => false,
|
||||
ceilometer => $ceilometer_hash[enabled],
|
||||
cinder_user_password => $cinder_hash[user_password],
|
||||
debug => $debug,
|
||||
enable_volumes => false,
|
||||
glance_api_servers => $glance_api_servers,
|
||||
identity_uri => $auth_uri,
|
||||
idle_timeout => $idle_timeout,
|
||||
iscsi_bind_host => $storage_address,
|
||||
iser => $storage_hash['iser'],
|
||||
keystone_tenant => $keystone_tenant,
|
||||
keystone_user => $keystone_user,
|
||||
manage_volumes => false,
|
||||
max_overflow => $max_overflow,
|
||||
max_pool_size => $max_pool_size,
|
||||
max_retries => $max_retries,
|
||||
queue_provider => $queue_provider,
|
||||
rabbit_ha_queues => hiera('rabbit_ha_queues', false),
|
||||
sql_connection => "mysql://${cinder_db_user}:${cinder_db_password}@${db_host}/${cinder_db_name}?charset=utf8&read_timeout=60",
|
||||
syslog_log_facility => $syslog_log_facility_cinder,
|
||||
use_stderr => $use_stderr,
|
||||
use_syslog => $use_syslog,
|
||||
verbose => $verbose,
|
||||
volume_group => 'cinder',
|
||||
}
|
||||
|
||||
$available_devices = $cinder_block_device_scheme[$node[0]['name']]
|
||||
|
||||
class { 'cinder::volume':
|
||||
package_ensure => $::openstack_version['cinder'],
|
||||
enabled => $enable_volumes,
|
||||
}
|
||||
|
||||
class { 'cinder::config':
|
||||
cinder_config => {
|
||||
# volume & iscsi parameters
|
||||
'DEFAULT/iscsi_ip_address' => { value => $storage_address },
|
||||
'DEFAULT/iscsi_helper' => { value => 'fake' },
|
||||
'DEFAULT/iscsi_protocol' => { value => 'iscsi' },
|
||||
'DEFAULT/volume_backend_name' => { value => 'DEFAULT' },
|
||||
'DEFAULT/volume_driver' => { value => 'cinder.volume.drivers.block_device.BlockDeviceDriver' },
|
||||
'DEFAULT/volume_group' => { value => 'cinder' },
|
||||
'DEFAULT/volume_dir' => { value => '/var/lib/cinder/volumes' },
|
||||
'DEFAULT/volume_clear' => { value => 'zero' },
|
||||
'DEFAULT/available_devices' => { value => $available_devices },
|
||||
|
||||
'keymgr/fixed_key' => { value => $cinder_hash[fixed_key] },
|
||||
'DEFAULT/auth_strategy' => { value => 'keystone' }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,5 @@
|
|||
notice('MODULAR: block-device/cinder-scheduler-filters.pp')
|
||||
|
||||
class { 'cinder::scheduler::filter':
|
||||
scheduler_default_filters => [ 'InstanceLocalityFilter', 'AvailabilityZoneFilter', 'CapacityFilter', 'CapabilitiesFilter' ],
|
||||
}
|
|
@ -0,0 +1,7 @@
|
|||
notice('MODULAR: block-device/sahara-volume-timeout.pp')
|
||||
|
||||
class { '::sahara::config':
|
||||
sahara_config => {
|
||||
'timeouts/await_attach_volumes' => { value => 60 },
|
||||
}
|
||||
}
|
|
@ -0,0 +1,41 @@
|
|||
- id: cinder-block-device
|
||||
type: group
|
||||
role: [cinder-block-device]
|
||||
requires: [deploy_start]
|
||||
required_for: [deploy_end]
|
||||
tasks: [ hiera, globals, tools, logging, netconfig, hosts, task-cinder-block-device ]
|
||||
required_for: [deploy_end]
|
||||
parameters:
|
||||
strategy:
|
||||
type: parallel
|
||||
|
||||
- id: task-cinder-block-device
|
||||
type: puppet
|
||||
groups: [ 'cinder-block-device' ]
|
||||
required_for: [deploy_end]
|
||||
requires: [deploy_start, hiera, netconfig, hosts]
|
||||
parameters:
|
||||
puppet_manifest: cinder-block-device.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
timeout: 3600
|
||||
|
||||
- id: cinder-scheduler-filter
|
||||
type: puppet
|
||||
groups: [ primary-controller, controller ]
|
||||
requires: [deploy_start, openstack-controller]
|
||||
required_for: [deploy_end]
|
||||
parameters:
|
||||
puppet_manifest: cinder-scheduler-filters.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
timeout: 3600
|
||||
|
||||
- id: sahara-config
|
||||
type: puppet
|
||||
groups: [ primary-controller, controller ]
|
||||
requires: [deploy_start, sahara]
|
||||
required_for: [deploy_end]
|
||||
condition: "settings:additional_components.sahara.value == true"
|
||||
parameters:
|
||||
puppet_manifest: sahara-volume-timeout.pp
|
||||
puppet_modules: /etc/puppet/modules
|
||||
timeout: 3600
|
|
@ -0,0 +1,7 @@
|
|||
attributes:
|
||||
block_device_scheme:
|
||||
label: 'Cinder Block Devices scheme'
|
||||
description: 'This scheme should describe which disks should be used by each node for Block Device. Should be in YAML format. For example: https://github.com/openstack/fuel-plugin-block-device/blob/master/scheme_example.yaml'
|
||||
weight: 5
|
||||
type: "file"
|
||||
value: "No file selected"
|
|
@ -0,0 +1,30 @@
|
|||
# Plugin name
|
||||
name: cinder_block_device_driver
|
||||
# Human-readable name for your plugin
|
||||
title: Block Device Driver Plugin
|
||||
# Plugin version
|
||||
version: '1.0.0'
|
||||
# Description
|
||||
description: Enable Cinder Block Device
|
||||
# Required fuel version
|
||||
fuel_version: ['7.0']
|
||||
# Specify license of your plugin
|
||||
licenses: ['Apache License Version 2.0']
|
||||
# Specify author or company name
|
||||
authors: ['Denis Egorenko, Mirantis Inc']
|
||||
# A link to the plugin's page
|
||||
homepage: 'https://github.com/openstack/fuel-plugin-block-device'
|
||||
# Specify a group which your plugin implements, possible options:
|
||||
# network, storage, storage::cinder, storage::glance, hypervisor
|
||||
groups: [ 'storage::cinder' ]
|
||||
|
||||
# The plugin is compatible with releases in the list
|
||||
releases:
|
||||
- os: ubuntu
|
||||
version: 2015.1.0-7.0
|
||||
mode: ['ha']
|
||||
deployment_scripts_path: deployment_scripts/
|
||||
repository_path: repositories/ubuntu
|
||||
|
||||
# Version of plugin package
|
||||
package_version: '3.0.0'
|
|
@ -0,0 +1,11 @@
|
|||
cinder-block-device:
|
||||
name: 'Block Device Driver'
|
||||
description: 'Block Device driver for Cinder'
|
||||
has_primary: false # whether has primary role or not
|
||||
public_ip_required: false # whether requires public net or not
|
||||
weight: 100
|
||||
limits:
|
||||
min: 1
|
||||
conflicts:
|
||||
- controller
|
||||
- cinder
|
|
@ -0,0 +1 @@
|
|||
#!/bin/bash -ex
|
|
@ -0,0 +1,5 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Add here any the actions which are required before plugin build
|
||||
# like packages building, packages downloading from mirrors and so on.
|
||||
# The script should return 0 if there were no errors.
|
|
@ -0,0 +1,2 @@
|
|||
node-1: /dev/sda,/dev/sdb
|
||||
node-2: /dev/sdb
|
|
@ -0,0 +1 @@
|
|||
[]
|
|
@ -0,0 +1,12 @@
|
|||
volumes:
|
||||
- id: "cinder-block-device"
|
||||
type: "vg"
|
||||
label: "Cinder Block Device"
|
||||
min_size: { generator: "calc_min_cinder_size" }
|
||||
mount: "none"
|
||||
volumes: []
|
||||
|
||||
volumes_roles_mapping:
|
||||
cinder-block-device:
|
||||
- {allocate_size: "min", id: "os"}
|
||||
- {allocate_size: "full-disk", id: "cinder-block-device"}
|
Loading…
Reference in New Issue