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

Merge pull request #9 from jaypipes/working

Browse Source 
Fixes from marathon chef-client debug session
This commit is contained in:
John Dewey
2012-12-07 15:30:51 -08:00
parent 6063cda896 4fc2f97279
commit ada59de6a4
8 changed files with 104 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
attributes/default.rb
View File

@@ -36,6 +36,10 @@ default["cinder"]["debug"] = "False"
# Availability zone/region for the Cinder service
default["cinder"]["region"] = "RegionOne"
# The name of the Chef role that installs the database and database user
# that Cinder uses
default["cinder"]["cinder_db_chef_role"] = "cinder"
# The name of the Chef role that knows about the message queue server
# that Cinder uses
default["cinder"]["rabbit_server_chef_role"] = "rabbitmq-server"

83
recipes/api.rb
View File

@@ -18,10 +18,18 @@
# limitations under the License.
#
include_recipe "cinder::common"
require "uri"
class ::Chef::Recipe
include ::Openstack
include ::Opscode::OpenSSL::Password
end
# Allow for using a well known service password
if node["developer_mode"]
node.set_unless["cinder"]["service_pass"] = "cinder"
else
node.set_unless["cinder"]["service_pass"] = secure_password
end
platform_options = node["cinder"]["platform"]
@@ -33,9 +41,19 @@ service "cinder-api" do
action :enable
end
execute "cinder-manage db sync" do
command "cinder-manage db sync"
not_if "cinder-manage db version && test $(cinder-manage db version) -gt 0"
action :nothing
end
db_role = node["cinder"]["cinder_db_chef_role"]
db_info = config_by_role db_role, "cinder"
db_user = node["cinder"]["db"]["username"]
db_pass = node["cinder"]["db"]["password"]
sql_connection = db_uri("cinder", db_user, "cinder")
db_pass = db_info["db"]["password"]
sql_connection = db_uri("volume", db_user, db_pass)
rabbit_server_role = node["cinder"]["rabbit_server_chef_role"]
rabbit_info = get_settings_by_role rabbit_server_role, "queue"
@@ -75,3 +93,62 @@ template "/etc/cinder/api-paste.ini" do
notifies :restart, resources(:service => "cinder-api"), :immediately
end
keystone_register "Register Cinder Volume Service" do
auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s
auth_protocol identity_admin_endpoint.scheme
api_ver identity_admin_endpoint.path
auth_token keystone["admin_token"]
service_name "cinder"
service_type "volume"
service_description "Cinder Volume Service"
endpoint_region node["cinder"]["region"]
endpoint_adminurl ::URI.decode api_endpoint.to_s
endpoint_internalurl ::URI.decode api_endpoint.to_s
endpoint_publicurl ::URI.decode api_endpoint.to_s
action :create_service
end
keystone_register "Register Cinder Volume Endpoint" do
auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s
auth_protocol identity_admin_endpoint.scheme
api_ver identity_admin_endpoint.path
auth_token keystone["admin_token"]
service_name "cinder"
service_type "volume"
service_description "Cinder Volume Service"
endpoint_region node["cinder"]["region"]
endpoint_adminurl ::URI.decode api_endpoint.to_s
endpoint_internalurl ::URI.decode api_endpoint.to_s
endpoint_publicurl ::URI.decode api_endpoint.to_s
action :create_endpoint
end
keystone_register "Register Cinder Service User" do
auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s
auth_protocol identity_admin_endpoint.scheme
api_ver identity_admin_endpoint.path
auth_token keystone["admin_token"]
tenant_name node["cinder"]["service_tenant_name"]
user_name node["cinder"]["service_user"]
user_pass node["cinder"]["service_pass"]
user_enabled "true" # Not required as this is the default
action :create_user
end
keystone_register "Grant service Role to Cinder Service User for Cinder Service Tenant" do
auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s
auth_protocol identity_admin_endpoint.scheme
api_ver identity_admin_endpoint.path
auth_token keystone["admin_token"]
tenant_name node["cinder"]["service_tenant_name"]
user_name node["cinder"]["service_user"]
role_name node["cinder"]["service_role"]
action :grant_role
end

31
recipes/common.rb
View File

@@ -1,31 +0,0 @@
#
# Cookbook Name:: cinder
# Recipe:: common
#
# Copyright 2012, Rackspace US, Inc.
# Copyright 2012, AT&T, Inc.
#
# 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.
#
class ::Chef::Recipe
include ::Openstack
include ::Opscode::OpenSSL::Password
end
# Allow for using a well known service password
if node["developer_mode"]
node.set_unless["cinder"]["service_pass"] = "cinder"
else
node.set_unless["cinder"]["service_pass"] = secure_password
end

13
recipes/scheduler.rb
View File

@@ -18,8 +18,6 @@
# limitations under the License.
#
include_recipe "cinder::common"
platform_options = node["cinder"]["platform"]
platform_options["cinder_scheduler_packages"].each do |pkg|
@@ -30,15 +28,18 @@ platform_options["cinder_scheduler_packages"].each do |pkg|
end
end
db_role = node["cinder"]["cinder_db_chef_role"]
db_info = config_by_role db_role, "cinder"
db_user = node["cinder"]["db"]["username"]
db_pass = node["cinder"]["db"]["password"]
sql_connection = db_uri("cinder", db_user, "cinder")
db_pass = db_info["db"]["password"]
sql_connection = db_uri("volume", db_user, db_pass)
rabbit_server_role = node["cinder"]["rabbit_server_chef_role"]
rabbit_info = get_settings_by_role rabbit_server_role, "queue"
rabbit_info = config_by_role rabbit_server_role, "queue"
glance_api_role = node["cinder"]["glance_api_chef_role"]
glance = get_settings_by_role glance_api_role, "glance"
glance = config_by_role glance_api_role, "glance"
glance_api_endpoint = endpoint "image-api"
service "cinder-scheduler" do

108
recipes/setup.rb
View File

@@ -1,108 +0,0 @@
#
# Cookbook Name:: cinder
# Recipe:: setup
#
# Copyright 2012, Rackspace US, Inc.
# Copyright 2012, AT&T, Inc.
#
# 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.
#
include_recipe "cinder::common"
class ::Chef::Recipe
include ::Openstack
end
platform_options = node["cinder"]["platform"]
platform_options["cinder_api_packages"].each do |pkg|
package pkg do
options platform_options["package_overrides"]
action :upgrade
end
end
execute "cinder-manage db sync" do
command "cinder-manage db sync"
not_if "cinder-manage db version && test $(cinder-manage db version) -gt 0"
action :nothing
end
db_user = node["cinder"]["db"]["username"]
db_pass = node["cinder"]["db"]["password"]
sql_connection = db_uri("cinder", db_user, "cinder")
rabbit_server_role = node["cinder"]["rabbit_server_chef_role"]
rabbit_info = get_settings_by_role rabbit_server_role, "queue"
glance_api_role = node["cinder"]["glance_api_chef_role"]
glance = get_settings_by_role glance_api_role, "glance"
glance_api_endpoint = endpoint "image-api"
template "/etc/cinder/cinder.conf" do
source "cinder.conf.erb"
group node["cinder"]["group"]
owner node["cinder"]["user"]
mode 00644
variables(
:sql_connection => sql_connection,
:rabbit_host => rabbit_info["host"],
:rabbit_port => rabbit_info["port"],
:glance_host => glance_api_endpoint.host,
:glance_port => glance_api_endpoint.port
)
notifies :run, resources(:execute => "cinder-manage db sync"), :immediately
end
identity_admin_endpoint = endpoint "identity-admin"
keystone_service_role = node["cinder"]["keystone_service_chef_role"]
keystone = get_settings_by_role keystone_service_role, "keystone"
api_endpoint = endpoint "volume-api"
keystone_register "Register Cinder Volume Service" do
auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s
auth_protocol identity_admin_endpoint.scheme
api_ver identity_admin_endpoint.path
auth_token keystone["admin_token"]
service_name "cinder"
service_type "volume"
service_description "Cinder Volume Service"
endpoint_region node["cinder"]["region"]
endpoint_adminurl api_endpoint.to_s
endpoint_internalurl api_endpoint.to_s
endpoint_publicurl api_endpoint.to_s
action :create_service
end
keystone_register "Register Cinder Volume Endpoint" do
auth_host identity_admin_endpoint.host
auth_port identity_admin_endpoint.port.to_s
auth_protocol identity_admin_endpoint.scheme
api_ver identity_admin_endpoint.path
auth_token keystone["admin_token"]
service_name "cinder"
service_type "volume"
service_description "Cinder Volume Service"
endpoint_region node["cinder"]["region"]
endpoint_adminurl api_endpoint.to_s
endpoint_internalurl api_endpoint.to_s
endpoint_publicurl api_endpoint.to_s
action :create_endpoint
end

13
recipes/volume.rb
View File

@@ -18,8 +18,6 @@
# limitations under the License.
#
include_recipe "cinder::common"
platform_options = node["cinder"]["platform"]
platform_options["cinder_volume_packages"].each do |pkg|
@@ -38,15 +36,18 @@ platform_options["cinder_iscsitarget_packages"].each do |pkg|
end
end
db_role = node["cinder"]["cinder_db_chef_role"]
db_info = config_by_role db_role, "cinder"
db_user = node["cinder"]["db"]["username"]
db_pass = node["cinder"]["db"]["password"]
sql_connection = db_uri("cinder", db_user, "cinder")
db_pass = db_info["db"]["password"]
sql_connection = db_uri("volume", db_user, db_pass)
rabbit_server_role = node["cinder"]["rabbit_server_chef_role"]
rabbit_info = get_settings_by_role rabbit_server_role, "queue"
rabbit_info = config_by_role rabbit_server_role, "queue"
glance_api_role = node["cinder"]["glance_api_chef_role"]
glance = get_settings_by_role glance_api_role, "glance"
glance = config_by_role glance_api_role, "glance"
glance_api_endpoint = endpoint "image-api"
service "cinder-volume" do

5
templates/default/api-paste.ini.erb
View File

@@ -39,7 +39,10 @@ paste.app_factory = cinder.api.openstack.volume.versions:Versions.factory
paste.filter_factory = cinder.api.auth:CinderKeystoneContext.factory
[filter:authtoken]
paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
# This needs to change to keystoneclient.middleware.auth_token:filter_factory
# when keystoneclient packages are updated (which contain the middleware, not
# the Keystone server package...)
paste.filter_factory = keystone.middleware.auth_token:filter_factory
service_host = <%= @identity_endpoint.host %>
service_port = <%= @identity_endpoint.port %>
service_protocol = <%= @identity_endpoint.scheme %>

4
templates/default/cinder.conf.erb
View File

@@ -71,10 +71,10 @@ sql_connection=<%= @sql_connection %>
my_ip=<%= node["ipaddress"] %>
#### (StrOpt) ip address of this host
glance_host=<%= @glance_api_host %>
glance_host=<%= @glance_host %>
#### (StrOpt) default glance hostname or ip
glance_port=<%= @glance_service_port %>
glance_port=<%= @glance_port %>
#### (IntOpt) default glance port
# glance_api_servers=$glance_host:$glance_port