4a7dc692b9
* added endpoint attributes (moved from common) * removed qpid as a messaging option (can be incuded in a wrapper) * deleted default attributes from nova.conf.rb originated in openstack-common * adapted optimized endpoint logic * removed rubocop exceptions in recipes and regenerated the .rubocop_todo.yaml containing all remaining exceptions * added versionbumb for refactored os-identity and common * moved version up to 13.0.0 for mitaka release * removed fedora, suse as supported platform * adapted the specs (unit tests) to work again * added new logic into templates/default/cinder.conf.erb * refactored attributes throughout all recipes that were connected to the attributes used for the cinder.conf.erb template to adapt the new template attribute syntax * moved all attributes from attributes/default.rb that were used in cinder_conf.erb to attributes/cinder_conf.rb * refactored attributes to fit upcomming template logic * refactored recipes to fit upcomming template logic * removed all attributes from default.rb and cinder.conf.erb which are set as default in attributes, openstack doc and used to render the template Depends-On: Ifa5a7f4e1df47a3961976e64f654224864c3dcb4 Depends-On: I3262b2e6f792f37c32a446e6567790b82bdd4613 Depends-On: I0547182085eed91d05384fdd7734408a839a9a2c Implements: blueprint cookbook-refactoring Change-Id: Idadc97bd7380d6c4f9f6f33d9c6b1215a5f24772
75 lines
2.1 KiB
Ruby
75 lines
2.1 KiB
Ruby
# encoding: UTF-8
|
|
#
|
|
# Cookbook Name:: openstack-block-storage
|
|
# Recipe:: volume
|
|
#
|
|
# Copyright 2012, Rackspace US, Inc.
|
|
# Copyright 2012-2013, AT&T Services, Inc.
|
|
# Copyright 2013, Opscode, Inc.
|
|
# Copyright 2013-2014, SUSE Linux Gmbh.
|
|
# Copyright 2013, 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.
|
|
#
|
|
|
|
# Chef
|
|
class ::Chef::Recipe
|
|
include ::Openstack
|
|
end
|
|
|
|
include_recipe 'openstack-block-storage::cinder-common'
|
|
|
|
platform_options = node['openstack']['block-storage']['platform']
|
|
|
|
platform_options['cinder_volume_packages'].each do |pkg|
|
|
package pkg do
|
|
options platform_options['package_overrides']
|
|
action :upgrade
|
|
end
|
|
end
|
|
|
|
db_type = node['openstack']['db']['block-storage']['service_type']
|
|
node['openstack']['db']['python_packages'][db_type].each do |pkg|
|
|
package pkg do
|
|
action :upgrade
|
|
end
|
|
end
|
|
|
|
platform_options['cinder_iscsitarget_packages'].each do |pkg|
|
|
package pkg do
|
|
options platform_options['package_overrides']
|
|
action :upgrade
|
|
end
|
|
end
|
|
|
|
service 'cinder-volume' do
|
|
service_name platform_options['cinder_volume_service']
|
|
supports status: true, restart: true
|
|
action [:enable, :start]
|
|
subscribes :restart, 'template[/etc/cinder/cinder.conf]'
|
|
end
|
|
|
|
service 'iscsitarget' do
|
|
service_name platform_options['cinder_iscsitarget_service']
|
|
supports status: true, restart: true
|
|
action :enable
|
|
end
|
|
|
|
# RHEL7 doesn't need targets.conf file
|
|
template '/etc/tgt/targets.conf' do
|
|
source 'targets.conf.erb'
|
|
mode 00600
|
|
notifies :restart, 'service[iscsitarget]', :immediately
|
|
not_if { node['platform_family'] == 'rhel' && node['platform_version'].to_i == 7 }
|
|
end
|