Moved attributes to the openstack namespace
Change-Id: Id18ff424018ded60c9c4570d81dbf5359f0187b7
This commit is contained in:
Carl Perry
parent
e37be72e3d
commit
d17c345fde
42
README.md
42
README.md
|
|
@ -50,27 +50,27 @@ Defaults to the ISCSI (LVM) Driver.
|
|||
Attributes
|
||||
==========
|
||||
|
||||
* `openstack-block-storage["db"]["username"]` - cinder username for database
|
||||
* `openstack-block-storage["rabbit"]["username"]` - Username for cinder rabbit access
|
||||
* `openstack-block-storage["rabbit"]["vhost"]` - The rabbit vhost to use
|
||||
* `openstack-block-storage["service_tenant_name"]` - name of tenant to use for the cinder service account in keystone
|
||||
* `openstack-block-storage["service_user"]` - cinder service user in keystone
|
||||
* `openstack-block-storage["service_role"]` - role for the cinder service user in keystone
|
||||
* `openstack-block-storage["syslog"]["use"]`
|
||||
* `openstack-block-storage["syslog"]["facility"]`
|
||||
* `openstack-block-storage["syslog"]["config_facility"]`
|
||||
* `openstack-block-storage["platform"]` - hash of platform specific package/service names and options
|
||||
* `openstack-block-storage["volume"]["state_path"]` - Top-level directory for maintaining cinder's state
|
||||
* `openstack-block-storage["volume"]["volume_driver"]` - Driver to use for volume creation
|
||||
* `openstack-block-storage["volume"]["volume_group"]` - Name for the VG that will contain exported volumes
|
||||
* `openstack-block-storage["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use
|
||||
* `openstack-block-storage["rbd_pool"]` - RADOS Block Device pool to use
|
||||
* `openstack-block-storage["rbd_user"]` - User for Cephx Authentication
|
||||
* `openstack-block-storage["rbd_secret_uuid"]` - Secret UUID for Cephx Authentication
|
||||
* `openstack-block-storage["policy"]["context_is_admin"]` - Define administrators
|
||||
* `openstack-block-storage["policy"]["default"]` - default volume operations rule
|
||||
* `openstack-block-storage["policy"]["admin_or_owner"]` - Define an admin or owner
|
||||
* `openstack-block-storage["policy"]["admin_api"]` - Define api admin
|
||||
* `openstack["block-storage"]["db"]["username"]` - cinder username for database
|
||||
* `openstack["block-storage"]["rabbit"]["username"]` - Username for cinder rabbit access
|
||||
* `openstack["block-storage"]["rabbit"]["vhost"]` - The rabbit vhost to use
|
||||
* `openstack["block-storage"]["service_tenant_name"]` - name of tenant to use for the cinder service account in keystone
|
||||
* `openstack["block-storage"]["service_user"]` - cinder service user in keystone
|
||||
* `openstack["block-storage"]["service_role"]` - role for the cinder service user in keystone
|
||||
* `openstack["block-storage"]["syslog"]["use"]`
|
||||
* `openstack["block-storage"]["syslog"]["facility"]`
|
||||
* `openstack["block-storage"]["syslog"]["config_facility"]`
|
||||
* `openstack["block-storage"]["platform"]` - hash of platform specific package/service names and options
|
||||
* `openstack["block-storage"]["volume"]["state_path"]` - Top-level directory for maintaining cinder's state
|
||||
* `openstack["block-storage"]["volume"]["volume_driver"]` - Driver to use for volume creation
|
||||
* `openstack["block-storage"]["volume"]["volume_group"]` - Name for the VG that will contain exported volumes
|
||||
* `openstack["block-storage"]["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use
|
||||
* `openstack["block-storage"]["rbd_pool"]` - RADOS Block Device pool to use
|
||||
* `openstack["block-storage"]["rbd_user"]` - User for Cephx Authentication
|
||||
* `openstack["block-storage"]["rbd_secret_uuid"]` - Secret UUID for Cephx Authentication
|
||||
* `openstack["block-storage"]["policy"]["context_is_admin"]` - Define administrators
|
||||
* `openstack["block-storage"]["policy"]["default"]` - default volume operations rule
|
||||
* `openstack["block-storage"]["policy"]["admin_or_owner"]` - Define an admin or owner
|
||||
* `openstack["block-storage"]["policy"]["admin_api"]` - Define api admin
|
||||
|
||||
Testing
|
||||
=====
|
||||
|
|
|
|||
|
|
@ -27,101 +27,101 @@ default["developer_mode"] = false # we want secure passwords by default
|
|||
|
||||
# Set to some text value if you want templated config files
|
||||
# to contain a custom banner at the top of the written file
|
||||
default["openstack-block-storage"]["custom_template_banner"] = "
|
||||
default["openstack"]["block-storage"]["custom_template_banner"] = "
|
||||
# This file autogenerated by Chef
|
||||
# Do not edit, changes will be overwritten
|
||||
"
|
||||
|
||||
default["openstack-block-storage"]["verbose"] = "False"
|
||||
default["openstack-block-storage"]["debug"] = "False"
|
||||
default["openstack"]["block-storage"]["verbose"] = "False"
|
||||
default["openstack"]["block-storage"]["debug"] = "False"
|
||||
|
||||
# Default lock_path
|
||||
default["openstack-block-storage"]["lock_path"] = "/var/lock/cinder"
|
||||
# Availability zone/region for the Openstack-Block-Storage service
|
||||
default["openstack-block-storage"]["region"] = "RegionOne"
|
||||
default["openstack"]["block-storage"]["lock_path"] = "/var/lock/cinder"
|
||||
# Availability zone/region for the Openstack"]["Block-Storage service
|
||||
default["openstack"]["block-storage"]["region"] = "RegionOne"
|
||||
|
||||
# The name of the Chef role that knows about the message queue server
|
||||
# that Cinder uses
|
||||
default["openstack-block-storage"]["rabbit_server_chef_role"] = "rabbitmq-server"
|
||||
default["openstack"]["block-storage"]["rabbit_server_chef_role"] = "rabbitmq-server"
|
||||
|
||||
# This is the name of the Chef role that will install the Keystone Service API
|
||||
default["openstack-block-storage"]["keystone_service_chef_role"] = "keystone"
|
||||
default["openstack"]["block-storage"]["keystone_service_chef_role"] = "keystone"
|
||||
|
||||
# This is the name of the Chef role that will install the Glance API
|
||||
default["openstack-block-storage"]["glance_api_chef_role"] = "glance-api"
|
||||
default["openstack"]["block-storage"]["glance_api_chef_role"] = "glance-api"
|
||||
|
||||
# Keystone PKI signing directory. Only written to the filter:authtoken section
|
||||
# of the api-paste.ini when node["openstack"]["auth"]["strategy"] == "pki"
|
||||
default["openstack-block-storage"]["api"]["auth"]["cache_dir"] = "/var/cache/cinder/api"
|
||||
default["openstack"]["block-storage"]["api"]["auth"]["cache_dir"] = "/var/cache/cinder/api"
|
||||
|
||||
# operating system group name
|
||||
default["openstack-block-storage"]["group"] = "cinder"
|
||||
default["openstack"]["block-storage"]["group"] = "cinder"
|
||||
# operating system user that services will run under
|
||||
default["openstack-block-storage"]["user"] = "cinder"
|
||||
default["openstack"]["block-storage"]["user"] = "cinder"
|
||||
|
||||
# Maximum allocatable gigabytes
|
||||
# Should equal total backend storage, default is 10TB
|
||||
default["openstack-block-storage"]["max_gigabytes"] = "10000"
|
||||
default["openstack"]["block-storage"]["max_gigabytes"] = "10000"
|
||||
|
||||
# Storage availability zone
|
||||
# Default is nova
|
||||
default["openstack-block-storage"]["storage_availability_zone"] = "nova"
|
||||
default["openstack"]["block-storage"]["storage_availability_zone"] = "nova"
|
||||
|
||||
# Quota definitions
|
||||
default["openstack-block-storage"]["quota_volumes"] = "10"
|
||||
default["openstack-block-storage"]["quota_gigabytes"] = "1000"
|
||||
default["openstack-block-storage"]["quota_driver"] = "cinder.quota.DbQuotaDriver"
|
||||
default["openstack"]["block-storage"]["quota_volumes"] = "10"
|
||||
default["openstack"]["block-storage"]["quota_gigabytes"] = "1000"
|
||||
default["openstack"]["block-storage"]["quota_driver"] = "cinder.quota.DbQuotaDriver"
|
||||
|
||||
# This user's password is stored in an encrypted databag
|
||||
# and accessed with openstack-common cookbook library's
|
||||
# user_password routine. You are expected to create
|
||||
# the user, pass, vhost in a wrapper rabbitmq cookbook.
|
||||
default["openstack-block-storage"]["rabbit"]["username"] = "rabbit"
|
||||
default["openstack-block-storage"]["rabbit"]["vhost"] = "/nova"
|
||||
default["openstack"]["block-storage"]["rabbit"]["username"] = "rabbit"
|
||||
default["openstack"]["block-storage"]["rabbit"]["vhost"] = "/nova"
|
||||
|
||||
default["openstack-block-storage"]["db"]["username"] = "cinder"
|
||||
default["openstack"]["block-storage"]["db"]["username"] = "cinder"
|
||||
|
||||
default["openstack-block-storage"]["service_tenant_name"] = "service"
|
||||
default["openstack-block-storage"]["service_user"] = "cinder"
|
||||
default["openstack-block-storage"]["service_role"] = "admin"
|
||||
default["openstack"]["block-storage"]["service_tenant_name"] = "service"
|
||||
default["openstack"]["block-storage"]["service_user"] = "cinder"
|
||||
default["openstack"]["block-storage"]["service_role"] = "admin"
|
||||
|
||||
# Netapp support
|
||||
default["openstack-block-storage"]["netapp"]["protocol"] = "http"
|
||||
default["openstack-block-storage"]["netapp"]["dfm_hostname"] = nil
|
||||
default["openstack-block-storage"]["netapp"]["dfm_login"] = nil
|
||||
default["openstack-block-storage"]["netapp"]["dfm_password"] = nil
|
||||
default["openstack-block-storage"]["netapp"]["dfm_port"] = "8088"
|
||||
default["openstack-block-storage"]["netapp"]["dfm_web_port"] = "8080"
|
||||
default["openstack-block-storage"]["netapp"]["storage_service"] = "storage_service"
|
||||
default["openstack-block-storage"]["netapp"]["driver"] = "/usr/share/pyshared/cinder/volume/netapp.py"
|
||||
default["openstack"]["block-storage"]["netapp"]["protocol"] = "http"
|
||||
default["openstack"]["block-storage"]["netapp"]["dfm_hostname"] = nil
|
||||
default["openstack"]["block-storage"]["netapp"]["dfm_login"] = nil
|
||||
default["openstack"]["block-storage"]["netapp"]["dfm_password"] = nil
|
||||
default["openstack"]["block-storage"]["netapp"]["dfm_port"] = "8088"
|
||||
default["openstack"]["block-storage"]["netapp"]["dfm_web_port"] = "8080"
|
||||
default["openstack"]["block-storage"]["netapp"]["storage_service"] = "storage_service"
|
||||
default["openstack"]["block-storage"]["netapp"]["driver"] = "/usr/share/pyshared/cinder/volume/netapp.py"
|
||||
|
||||
# logging attribute
|
||||
default["openstack-block-storage"]["syslog"]["use"] = false
|
||||
default["openstack-block-storage"]["syslog"]["facility"] = "LOG_LOCAL2"
|
||||
default["openstack-block-storage"]["syslog"]["config_facility"] = "local2"
|
||||
default["openstack"]["block-storage"]["syslog"]["use"] = false
|
||||
default["openstack"]["block-storage"]["syslog"]["facility"] = "LOG_LOCAL2"
|
||||
default["openstack"]["block-storage"]["syslog"]["config_facility"] = "local2"
|
||||
|
||||
default["openstack-block-storage"]["api"]["ratelimit"] = "True"
|
||||
default["openstack-block-storage"]["cron"]["minute"] = '00'
|
||||
default["openstack"]["block-storage"]["api"]["ratelimit"] = "True"
|
||||
default["openstack"]["block-storage"]["cron"]["minute"] = '00'
|
||||
|
||||
default["openstack-block-storage"]["volume"]["state_path"] = "/var/lib/cinder"
|
||||
default["openstack-block-storage"]["volume"]["volume_driver"] = "cinder.volume.driver.ISCSIDriver"
|
||||
default["openstack-block-storage"]["volume"]["volume_group"] = "cinder-volumes"
|
||||
default["openstack-block-storage"]["volume"]["iscsi_helper"] = "tgtadm"
|
||||
default["openstack"]["block-storage"]["volume"]["state_path"] = "/var/lib/cinder"
|
||||
default["openstack"]["block-storage"]["volume"]["volume_driver"] = "cinder.volume.driver.ISCSIDriver"
|
||||
default["openstack"]["block-storage"]["volume"]["volume_group"] = "cinder-volumes"
|
||||
default["openstack"]["block-storage"]["volume"]["iscsi_helper"] = "tgtadm"
|
||||
|
||||
# Ceph/RADOS options
|
||||
default["openstack-block-storage"]["rbd_pool"] = "rbd"
|
||||
default["openstack-block-storage"]["rbd_user"] = nil
|
||||
default["openstack-block-storage"]["rbd_secret_uuid"] = nil
|
||||
default["openstack"]["block-storage"]["rbd_pool"] = "rbd"
|
||||
default["openstack"]["block-storage"]["rbd_user"] = nil
|
||||
default["openstack"]["block-storage"]["rbd_secret_uuid"] = nil
|
||||
|
||||
# Cinder Policy defaults
|
||||
default["openstack-block-storage"]["policy"]["context_is_admin"] = '["role:admin"]'
|
||||
default["openstack-block-storage"]["policy"]["default"] = '["rule:admin_or_owner"]'
|
||||
default["openstack-block-storage"]["policy"]["admin_or_owner"] = '["is_admin:True"], ["project_id:%(project_id)s"]'
|
||||
default["openstack-block-storage"]["policy"]["admin_api"] = '["is_admin:True"]'
|
||||
default["openstack"]["block-storage"]["policy"]["context_is_admin"] = '["role:admin"]'
|
||||
default["openstack"]["block-storage"]["policy"]["default"] = '["rule:admin_or_owner"]'
|
||||
default["openstack"]["block-storage"]["policy"]["admin_or_owner"] = '["is_admin:True"], ["project_id:%(project_id)s"]'
|
||||
default["openstack"]["block-storage"]["policy"]["admin_api"] = '["is_admin:True"]'
|
||||
|
||||
case platform
|
||||
when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
|
||||
default["openstack-block-storage"]["platform"] = {
|
||||
default["openstack"]["block-storage"]["platform"] = {
|
||||
"cinder_api_packages" => ["openstack-cinder", "python-cinderclient", "MySQL-python"],
|
||||
"cinder_api_service" => "openstack-cinder-api",
|
||||
"cinder_volume_packages" => ["openstack-cinder", "MySQL-python"],
|
||||
|
|
@ -133,7 +133,7 @@ when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
|
|||
"package_overrides" => ""
|
||||
}
|
||||
when "ubuntu"
|
||||
default["openstack-block-storage"]["platform"] = {
|
||||
default["openstack"]["block-storage"]["platform"] = {
|
||||
"cinder_api_packages" => ["cinder-common", "cinder-api", "python-cinderclient", "python-mysqldb"],
|
||||
"cinder_api_service" => "cinder-api",
|
||||
"cinder_volume_packages" => ["cinder-volume", "python-mysqldb"],
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ class ::Chef::Recipe
|
|||
include ::Openstack
|
||||
end
|
||||
|
||||
if node["openstack-block-storage"]["syslog"]["use"]
|
||||
if node["openstack"]["block-storage"]["syslog"]["use"]
|
||||
include_recipe "openstack-common::logging"
|
||||
end
|
||||
|
||||
platform_options = node["openstack-block-storage"]["platform"]
|
||||
platform_options = node["openstack"]["block-storage"]["platform"]
|
||||
|
||||
platform_options["cinder_api_packages"].each do |pkg|
|
||||
package pkg do
|
||||
|
|
@ -37,9 +37,9 @@ platform_options["cinder_api_packages"].each do |pkg|
|
|||
end
|
||||
end
|
||||
|
||||
directory ::File.dirname(node["openstack-block-storage"]["api"]["auth"]["cache_dir"]) do
|
||||
owner node["openstack-block-storage"]["user"]
|
||||
group node["openstack-block-storage"]["group"]
|
||||
directory ::File.dirname(node["openstack"]["block-storage"]["api"]["auth"]["cache_dir"]) do
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
mode 00700
|
||||
|
||||
only_if { node["openstack"]["auth"]["strategy"] == "pki" }
|
||||
|
|
@ -52,18 +52,18 @@ service "cinder-api" do
|
|||
action :enable
|
||||
end
|
||||
|
||||
db_user = node["openstack-block-storage"]["db"]["username"]
|
||||
db_user = node["openstack"]["block-storage"]["db"]["username"]
|
||||
db_pass = db_password "cinder"
|
||||
sql_connection = db_uri("volume", db_user, db_pass)
|
||||
|
||||
rabbit_server_role = node["openstack-block-storage"]["rabbit_server_chef_role"]
|
||||
rabbit_server_role = node["openstack"]["block-storage"]["rabbit_server_chef_role"]
|
||||
rabbit_info = config_by_role rabbit_server_role, "queue"
|
||||
|
||||
rabbit_user = node["openstack-block-storage"]["rabbit"]["username"]
|
||||
rabbit_user = node["openstack"]["block-storage"]["rabbit"]["username"]
|
||||
rabbit_pass = user_password "rabbit"
|
||||
rabbit_vhost = node["openstack-block-storage"]["rabbit"]["vhost"]
|
||||
rabbit_vhost = node["openstack"]["block-storage"]["rabbit"]["vhost"]
|
||||
|
||||
glance_api_role = node["openstack-block-storage"]["glance_api_chef_role"]
|
||||
glance_api_role = node["openstack"]["block-storage"]["glance_api_chef_role"]
|
||||
glance = config_by_role glance_api_role, "glance"
|
||||
glance_api_endpoint = endpoint "image-api"
|
||||
|
||||
|
|
@ -72,8 +72,8 @@ service_pass = service_password "openstack-block-storage"
|
|||
|
||||
template "/etc/cinder/cinder.conf" do
|
||||
source "cinder.conf.erb"
|
||||
group node["openstack-block-storage"]["group"]
|
||||
owner node["openstack-block-storage"]["user"]
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
mode 00644
|
||||
variables(
|
||||
:sql_connection => sql_connection,
|
||||
|
|
@ -93,8 +93,8 @@ execute "cinder-manage db sync"
|
|||
|
||||
template "/etc/cinder/api-paste.ini" do
|
||||
source "api-paste.ini.erb"
|
||||
group node["openstack-block-storage"]["group"]
|
||||
owner node["openstack-block-storage"]["user"]
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
mode 00644
|
||||
variables(
|
||||
:identity_admin_endpoint => identity_admin_endpoint,
|
||||
|
|
@ -106,8 +106,8 @@ end
|
|||
|
||||
template "/etc/cinder/policy.json" do
|
||||
source "policy.json.erb"
|
||||
owner node["openstack-block-storage"]["user"]
|
||||
group node["openstack-block-storage"]["group"]
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
mode 00644
|
||||
notifies :restart, "service[cinder-api]"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -32,6 +32,6 @@ include_recipe "mysql::ruby"
|
|||
db_pass = db_password "cinder"
|
||||
|
||||
db_create_with_user("volume",
|
||||
node["openstack-block-storage"]["db"]["username"],
|
||||
node["openstack"]["block-storage"]["db"]["username"],
|
||||
db_pass
|
||||
)
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ keystone_register "Register Cinder Volume Service" do
|
|||
service_name "cinder"
|
||||
service_type "volume"
|
||||
service_description "Cinder Volume Service"
|
||||
endpoint_region node["openstack-block-storage"]["region"]
|
||||
endpoint_region node["openstack"]["block-storage"]["region"]
|
||||
endpoint_adminurl ::URI.decode cinder_api_endpoint.to_s
|
||||
endpoint_internalurl ::URI.decode cinder_api_endpoint.to_s
|
||||
endpoint_publicurl ::URI.decode cinder_api_endpoint.to_s
|
||||
|
|
@ -51,7 +51,7 @@ keystone_register "Register Cinder Volume Endpoint" do
|
|||
service_name "cinder"
|
||||
service_type "volume"
|
||||
service_description "Cinder Volume Service"
|
||||
endpoint_region node["openstack-block-storage"]["region"]
|
||||
endpoint_region node["openstack"]["block-storage"]["region"]
|
||||
endpoint_adminurl ::URI.decode cinder_api_endpoint.to_s
|
||||
endpoint_internalurl ::URI.decode cinder_api_endpoint.to_s
|
||||
endpoint_publicurl ::URI.decode cinder_api_endpoint.to_s
|
||||
|
|
@ -62,8 +62,8 @@ end
|
|||
keystone_register "Register Cinder Service User" do
|
||||
auth_uri auth_uri
|
||||
bootstrap_token bootstrap_token
|
||||
tenant_name node["openstack-block-storage"]["service_tenant_name"]
|
||||
user_name node["openstack-block-storage"]["service_user"]
|
||||
tenant_name node["openstack"]["block-storage"]["service_tenant_name"]
|
||||
user_name node["openstack"]["block-storage"]["service_user"]
|
||||
user_pass service_pass
|
||||
user_enabled "true" # Not required as this is the default
|
||||
action :create_user
|
||||
|
|
@ -72,8 +72,8 @@ end
|
|||
keystone_register "Grant service Role to Cinder Service User for Cinder Service Tenant" do
|
||||
auth_uri auth_uri
|
||||
bootstrap_token bootstrap_token
|
||||
tenant_name node["openstack-block-storage"]["service_tenant_name"]
|
||||
user_name node["openstack-block-storage"]["service_user"]
|
||||
role_name node["openstack-block-storage"]["service_role"]
|
||||
tenant_name node["openstack"]["block-storage"]["service_tenant_name"]
|
||||
user_name node["openstack"]["block-storage"]["service_user"]
|
||||
role_name node["openstack"]["block-storage"]["service_role"]
|
||||
action :grant_role
|
||||
end
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
# limitations under the License.
|
||||
#
|
||||
|
||||
if node["openstack-block-storage"]["syslog"]["use"]
|
||||
if node["openstack"]["block-storage"]["syslog"]["use"]
|
||||
include_recipe "openstack-common::logging"
|
||||
end
|
||||
|
||||
platform_options = node["openstack-block-storage"]["platform"]
|
||||
platform_options = node["openstack"]["block-storage"]["platform"]
|
||||
|
||||
platform_options["cinder_scheduler_packages"].each do |pkg|
|
||||
package pkg do
|
||||
|
|
@ -33,18 +33,18 @@ platform_options["cinder_scheduler_packages"].each do |pkg|
|
|||
end
|
||||
end
|
||||
|
||||
db_user = node["openstack-block-storage"]["db"]["username"]
|
||||
db_user = node["openstack"]["block-storage"]["db"]["username"]
|
||||
db_pass = db_password "cinder"
|
||||
sql_connection = db_uri("volume", db_user, db_pass)
|
||||
|
||||
rabbit_server_role = node["openstack-block-storage"]["rabbit_server_chef_role"]
|
||||
rabbit_server_role = node["openstack"]["block-storage"]["rabbit_server_chef_role"]
|
||||
rabbit_info = config_by_role rabbit_server_role, "queue"
|
||||
|
||||
rabbit_user = node["openstack-block-storage"]["rabbit"]["username"]
|
||||
rabbit_user = node["openstack"]["block-storage"]["rabbit"]["username"]
|
||||
rabbit_pass = user_password "rabbit"
|
||||
rabbit_vhost = node["openstack-block-storage"]["rabbit"]["vhost"]
|
||||
rabbit_vhost = node["openstack"]["block-storage"]["rabbit"]["vhost"]
|
||||
|
||||
glance_api_role = node["openstack-block-storage"]["glance_api_chef_role"]
|
||||
glance_api_role = node["openstack"]["block-storage"]["glance_api_chef_role"]
|
||||
glance = config_by_role glance_api_role, "glance"
|
||||
glance_api_endpoint = endpoint "image-api"
|
||||
|
||||
|
|
@ -57,8 +57,8 @@ end
|
|||
|
||||
template "/etc/cinder/cinder.conf" do
|
||||
source "cinder.conf.erb"
|
||||
group node["openstack-block-storage"]["group"]
|
||||
owner node["openstack-block-storage"]["user"]
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
mode 00644
|
||||
variables(
|
||||
:sql_connection => sql_connection,
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@ class ::Chef::Recipe
|
|||
include ::Openstack
|
||||
end
|
||||
|
||||
if node["openstack-block-storage"]["syslog"]["use"]
|
||||
if node["openstack"]["block-storage"]["syslog"]["use"]
|
||||
include_recipe "openstack-common::logging"
|
||||
end
|
||||
|
||||
platform_options = node["openstack-block-storage"]["platform"]
|
||||
platform_options = node["openstack"]["block-storage"]["platform"]
|
||||
|
||||
platform_options["cinder_volume_packages"].each do |pkg|
|
||||
package pkg do
|
||||
|
|
@ -45,22 +45,22 @@ platform_options["cinder_iscsitarget_packages"].each do |pkg|
|
|||
end
|
||||
end
|
||||
|
||||
db_user = node["openstack-block-storage"]["db"]["username"]
|
||||
db_user = node["openstack"]["block-storage"]["db"]["username"]
|
||||
db_pass = db_password "cinder"
|
||||
sql_connection = db_uri("volume", db_user, db_pass)
|
||||
|
||||
rabbit_server_role = node["openstack-block-storage"]["rabbit_server_chef_role"]
|
||||
rabbit_server_role = node["openstack"]["block-storage"]["rabbit_server_chef_role"]
|
||||
rabbit_info = config_by_role rabbit_server_role, "queue"
|
||||
|
||||
rabbit_user = node["openstack-block-storage"]["rabbit"]["username"]
|
||||
rabbit_user = node["openstack"]["block-storage"]["rabbit"]["username"]
|
||||
rabbit_pass = user_password "rabbit"
|
||||
rabbit_vhost = node["openstack-block-storage"]["rabbit"]["vhost"]
|
||||
rabbit_vhost = node["openstack"]["block-storage"]["rabbit"]["vhost"]
|
||||
|
||||
glance_api_role = node["openstack-block-storage"]["glance_api_chef_role"]
|
||||
glance_api_role = node["openstack"]["block-storage"]["glance_api_chef_role"]
|
||||
glance = config_by_role glance_api_role, "glance"
|
||||
glance_api_endpoint = endpoint "image-api"
|
||||
|
||||
node.override["openstack-block-storage"]["netapp"]["dfm_password"] = service_password "netapp"
|
||||
node.override["openstack"]["block-storage"]["netapp"]["dfm_password"] = service_password "netapp"
|
||||
|
||||
service "cinder-volume" do
|
||||
service_name platform_options["cinder_volume_service"]
|
||||
|
|
@ -71,8 +71,8 @@ end
|
|||
|
||||
template "/etc/cinder/cinder.conf" do
|
||||
source "cinder.conf.erb"
|
||||
group node["openstack-block-storage"]["group"]
|
||||
owner node["openstack-block-storage"]["user"]
|
||||
group node["openstack"]["block-storage"]["group"]
|
||||
owner node["openstack"]["block-storage"]["user"]
|
||||
mode 00644
|
||||
variables(
|
||||
:sql_connection => sql_connection,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ describe "openstack-block-storage::api" do
|
|||
cinder_stubs
|
||||
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
||||
@node = @chef_run.node
|
||||
@node.set["openstack-block-storage"]["syslog"]["use"] = true
|
||||
@node.set["openstack"]["block-storage"]["syslog"]["use"] = true
|
||||
@chef_run.converge "openstack-block-storage::api"
|
||||
end
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ describe "openstack-block-storage::api" do
|
|||
it "has rbd driver settings" do
|
||||
chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
||||
node = chef_run.node
|
||||
node.set["openstack-block-storage"]["volume"] = {
|
||||
node.set["openstack"]["block-storage"]["volume"] = {
|
||||
"volume_driver" => "cinder.volume.driver.RBDDriver"
|
||||
}
|
||||
chef_run.converge "openstack-block-storage::api"
|
||||
|
|
@ -84,7 +84,7 @@ describe "openstack-block-storage::api" do
|
|||
it "has netapp driver settings" do
|
||||
chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
||||
node = chef_run.node
|
||||
node.set["openstack-block-storage"]["volume"] = {
|
||||
node.set["openstack"]["block-storage"]["volume"] = {
|
||||
"volume_driver" => "cinder.volume.netapp.NetAppISCSIDriver"
|
||||
}
|
||||
chef_run.converge "openstack-block-storage::api"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ describe "openstack-block-storage::scheduler" do
|
|||
cinder_stubs
|
||||
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
||||
@node = @chef_run.node
|
||||
@node.set["openstack-block-storage"]["syslog"]["use"] = true
|
||||
@node.set["openstack"]["block-storage"]["syslog"]["use"] = true
|
||||
@chef_run.converge "openstack-block-storage::scheduler"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ describe "openstack-block-storage::volume" do
|
|||
cinder_stubs
|
||||
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
|
||||
@node = @chef_run.node
|
||||
@node.set["openstack-block-storage"]["syslog"]["use"] = true
|
||||
@node.set["openstack"]["block-storage"]["syslog"]["use"] = true
|
||||
@chef_run.converge "openstack-block-storage::volume"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<%= node["openstack-block-storage"]["custom_template_banner"] %>
|
||||
<%= node["openstack"]["block-storage"]["custom_template_banner"] %>
|
||||
|
||||
#############
|
||||
# Openstack #
|
||||
|
|
@ -48,9 +48,9 @@ paste.filter_factory = keystone.middleware.auth_token:filter_factory
|
|||
auth_host = <%= @identity_admin_endpoint.host %>
|
||||
auth_port = <%= @identity_admin_endpoint.port %>
|
||||
auth_protocol = <%= @identity_admin_endpoint.scheme %>
|
||||
admin_tenant_name = <%= node["openstack-block-storage"]["service_tenant_name"] %>
|
||||
admin_user = <%= node["openstack-block-storage"]["service_user"] %>
|
||||
admin_tenant_name = <%= node["openstack"]["block-storage"]["service_tenant_name"] %>
|
||||
admin_user = <%= node["openstack"]["block-storage"]["service_user"] %>
|
||||
admin_password = <%= @service_pass %>
|
||||
<% if node["openstack"]["auth"]["strategy"] == "pki" -%>
|
||||
signing_dir = <%= node["openstack-block-storage"]["api"]["auth"]["cache_dir"] %>
|
||||
signing_dir = <%= node["openstack"]["block-storage"]["api"]["auth"]["cache_dir"] %>
|
||||
<% end -%>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
<%= node["openstack-block-storage"]["custom_template_banner"] %>
|
||||
<%= node["openstack"]["block-storage"]["custom_template_banner"] %>
|
||||
|
||||
[DEFAULT]
|
||||
|
||||
######## defined in cinder.openstack.common.cfg:CommonConfigOpts ########
|
||||
|
||||
debug=<%= node["openstack-block-storage"]["debug"] %>
|
||||
debug=<%= node["openstack"]["block-storage"]["debug"] %>
|
||||
#### (BoolOpt) Print debugging output
|
||||
|
||||
verbose=<%= node["openstack-block-storage"]["verbose"] %>
|
||||
verbose=<%= node["openstack"]["block-storage"]["verbose"] %>
|
||||
#### (BoolOpt) Print more verbose output
|
||||
|
||||
# lock_path
|
||||
lock_path=<%= node["openstack-block-storage"]["lock_path"] %>
|
||||
lock_path=<%= node["openstack"]["block-storage"]["lock_path"] %>
|
||||
notification_driver=cinder.openstack.common.notifier.rabbit_notifier
|
||||
|
||||
# log_config=<None>
|
||||
|
|
@ -39,7 +39,7 @@ notification_driver=cinder.openstack.common.notifier.rabbit_notifier
|
|||
|
||||
# ================= Syslog Options ============================
|
||||
|
||||
<% if node["openstack-block-storage"]["syslog"]["use"] %>
|
||||
<% if node["openstack"]["block-storage"]["syslog"]["use"] %>
|
||||
log_config = /etc/openstack/logging.conf
|
||||
<% end %>
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ sql_connection=<%= @sql_connection %>
|
|||
# bindir=$pybasedir/bin
|
||||
#### (StrOpt) Directory where cinder binaries are installed
|
||||
|
||||
state_path=<%= node["openstack-block-storage"]["volume"]["state_path"] %>
|
||||
state_path=<%= node["openstack"]["block-storage"]["volume"]["state_path"] %>
|
||||
#### (StrOpt) Top-level directory for maintaining cinder's state
|
||||
|
||||
my_ip=<%= node["ipaddress"] %>
|
||||
|
|
@ -92,7 +92,7 @@ glance_port=<%= @glance_port %>
|
|||
# volume_topic=cinder-volume
|
||||
#### (StrOpt) the topic volume nodes listen on
|
||||
|
||||
api_rate_limit=<%= node["openstack-block-storage"]["api"]["ratelimit"] %>
|
||||
api_rate_limit=<%= node["openstack"]["block-storage"]["api"]["ratelimit"] %>
|
||||
#### (BoolOpt) whether to rate limit the api
|
||||
|
||||
# osapi_volume_ext_list=
|
||||
|
|
@ -137,7 +137,7 @@ api_rate_limit=<%= node["openstack-block-storage"]["api"]["ratelimit"] %>
|
|||
#### (StrOpt) Name of this node. This can be an opaque identifier. It is
|
||||
#### not necessarily a hostname, FQDN, or IP address.
|
||||
|
||||
storage_availability_zone=<%= node["openstack-block-storage"]["storage_availability_zone"] %>
|
||||
storage_availability_zone=<%= node["openstack"]["block-storage"]["storage_availability_zone"] %>
|
||||
#### (StrOpt) availability zone of this node
|
||||
|
||||
# memcached_servers=<None>
|
||||
|
|
@ -185,10 +185,10 @@ auth_strategy=keystone
|
|||
|
||||
######## defined in cinder.quota ########
|
||||
|
||||
quota_volumes=<%= node["openstack-block-storage"]["quota_volumes"] %>
|
||||
quota_volumes=<%= node["openstack"]["block-storage"]["quota_volumes"] %>
|
||||
#### (IntOpt) number of volumes allowed per project
|
||||
|
||||
quota_gigabytes=<%= node["openstack-block-storage"]["quota_gigabytes"] %>
|
||||
quota_gigabytes=<%= node["openstack"]["block-storage"]["quota_gigabytes"] %>
|
||||
#### (IntOpt) number of volume gigabytes allowed per project
|
||||
|
||||
# reservation_expire=86400
|
||||
|
|
@ -200,7 +200,7 @@ quota_gigabytes=<%= node["openstack-block-storage"]["quota_gigabytes"] %>
|
|||
# max_age=0
|
||||
#### (IntOpt) number of seconds between subsequent usage refreshes
|
||||
|
||||
quota_driver=<%= node["openstack-block-storage"]["quota_driver"] %>
|
||||
quota_driver=<%= node["openstack"]["block-storage"]["quota_driver"] %>
|
||||
#### (StrOpt) default driver to use for quota checks
|
||||
|
||||
|
||||
|
|
@ -503,7 +503,7 @@ rabbit_virtual_host=<%= @rabbit_virtual_host %>
|
|||
|
||||
######## defined in cinder.scheduler.simple ########
|
||||
|
||||
max_gigabytes=<%= node["openstack-block-storage"]["max_gigabytes"] %>
|
||||
max_gigabytes=<%= node["openstack"]["block-storage"]["max_gigabytes"] %>
|
||||
#### (IntOpt) maximum number of volume gigabytes to allow per host
|
||||
|
||||
|
||||
|
|
@ -516,7 +516,7 @@ max_gigabytes=<%= node["openstack-block-storage"]["max_gigabytes"] %>
|
|||
|
||||
######## defined in cinder.volume.driver ########
|
||||
|
||||
volume_group=<%= node["openstack-block-storage"]["volume"]["volume_group"] %>
|
||||
volume_group=<%= node["openstack"]["block-storage"]["volume"]["volume_group"] %>
|
||||
#### (StrOpt) Name for the VG that will contain exported volumes
|
||||
|
||||
# num_shell_tries=3
|
||||
|
|
@ -536,14 +536,14 @@ volume_group=<%= node["openstack-block-storage"]["volume"]["volume_group"] %>
|
|||
|
||||
# iscsi_port=3260
|
||||
#### (IntOpt) The port that the iSCSI daemon is listening on
|
||||
<% if node["openstack-block-storage"]["volume"]["volume_driver"] == 'cinder.volume.driver.RBDDriver' %>
|
||||
rbd_pool=<%= node["openstack-block-storage"]["rbd_pool"] %>
|
||||
<% if node["openstack"]["block-storage"]["volume"]["volume_driver"] == 'cinder.volume.driver.RBDDriver' %>
|
||||
rbd_pool=<%= node["openstack"]["block-storage"]["rbd_pool"] %>
|
||||
#### (StrOpt) the RADOS pool in which rbd volumes are stored
|
||||
|
||||
rbd_user=<%= node["openstack-block-storage"]["rbd_user"] %>
|
||||
rbd_user=<%= node["openstack"]["block-storage"]["rbd_user"] %>
|
||||
#### (StrOpt) the RADOS client name for accessing rbd volumes
|
||||
|
||||
rbd_secret_uuid=<%= node["openstack-block-storage"]["rbd_secret_uuid"] %>
|
||||
rbd_secret_uuid=<%= node["openstack"]["block-storage"]["rbd_secret_uuid"] %>
|
||||
#### (StrOpt) the libvirt uuid of the secret for the rbd_uservolumes
|
||||
<% end %>
|
||||
# volume_tmp_dir=<None>
|
||||
|
|
@ -553,7 +553,7 @@ rbd_secret_uuid=<%= node["openstack-block-storage"]["rbd_secret_uuid"] %>
|
|||
|
||||
######## defined in cinder.volume.iscsi ########
|
||||
|
||||
iscsi_helper=<%= node["openstack-block-storage"]["volume"]["iscsi_helper"] %>
|
||||
iscsi_helper=<%= node["openstack"]["block-storage"]["volume"]["iscsi_helper"] %>
|
||||
#### (StrOpt) iscsi target user-land tool to use
|
||||
|
||||
# volumes_dir=$state_path/volumes
|
||||
|
|
@ -562,7 +562,7 @@ iscsi_helper=<%= node["openstack-block-storage"]["volume"]["iscsi_helper"] %>
|
|||
|
||||
######## defined in cinder.volume.manager ########
|
||||
|
||||
volume_driver=<%= node["openstack-block-storage"]["volume"]["volume_driver"] %>
|
||||
volume_driver=<%= node["openstack"]["block-storage"]["volume"]["volume_driver"] %>
|
||||
#### (StrOpt) Driver to use for volume creation
|
||||
|
||||
# use_local_volumes=true
|
||||
|
|
@ -574,23 +574,23 @@ volume_driver=<%= node["openstack-block-storage"]["volume"]["volume_driver"] %>
|
|||
|
||||
######## defined in cinder.volume.netapp ########
|
||||
|
||||
<% if node["openstack-block-storage"]["volume"]["volume_driver"] == "cinder.volume.netapp.NetAppISCSIDriver" %>
|
||||
netapp_wsdl_url=<%= node["openstack-block-storage"]["netapp"]["protocol"] %>://<%= node["openstack-block-storage"]["netapp"]["dfm_hostname"] %>:<%= node["openstack-block-storage"]["netapp"]["dfm_web_port"] %>/dfm.wsdl
|
||||
<% if node["openstack"]["block-storage"]["volume"]["volume_driver"] == "cinder.volume.netapp.NetAppISCSIDriver" %>
|
||||
netapp_wsdl_url=<%= node["openstack"]["block-storage"]["netapp"]["protocol"] %>://<%= node["openstack"]["block-storage"]["netapp"]["dfm_hostname"] %>:<%= node["openstack"]["block-storage"]["netapp"]["dfm_web_port"] %>/dfm.wsdl
|
||||
#### (StrOpt) URL of the WSDL file for the DFM server
|
||||
|
||||
netapp_login=<%= node["openstack-block-storage"]["netapp"]["dfm_login"] %>
|
||||
netapp_login=<%= node["openstack"]["block-storage"]["netapp"]["dfm_login"] %>
|
||||
#### (StrOpt) User name for the DFM server
|
||||
|
||||
netapp_password=<%= node["openstack-block-storage"]["netapp"]["dfm_password"] %>
|
||||
netapp_password=<%= node["openstack"]["block-storage"]["netapp"]["dfm_password"] %>
|
||||
#### (StrOpt) Password for the DFM server
|
||||
|
||||
netapp_server_hostname=<%= node["openstack-block-storage"]["netapp"]["dfm_hostname"] %>
|
||||
netapp_server_hostname=<%= node["openstack"]["block-storage"]["netapp"]["dfm_hostname"] %>
|
||||
#### (StrOpt) Hostname for the DFM server
|
||||
|
||||
netapp_server_port=<%= node["openstack-block-storage"]["netapp"]["dfm_port"] %>
|
||||
netapp_server_port=<%= node["openstack"]["block-storage"]["netapp"]["dfm_port"] %>
|
||||
#### (IntOpt) Port number for the DFM server
|
||||
|
||||
netapp_storage_service=<%= node["openstack-block-storage"]["netapp"]["storage_service"] %>
|
||||
netapp_storage_service=<%= node["openstack"]["block-storage"]["netapp"]["storage_service"] %>
|
||||
#### (StrOpt) Storage service to use for provisioning (when
|
||||
#### volume_type=None)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
<%= node["openstack-block-storage"]["custom_template_banner"] %>
|
||||
<%= node["openstack"]["block-storage"]["custom_template_banner"] %>
|
||||
{
|
||||
"context_is_admin": [<%= node["openstack-block-storage"]["policy"]["context_is_admin"] %>],
|
||||
"admin_or_owner": [<%= node["openstack-block-storage"]["policy"]["admin_or_owner"] %>],
|
||||
"default": [<%= node["openstack-block-storage"]["policy"]["default"] %>],
|
||||
"context_is_admin": [<%= node["openstack"]["block-storage"]["policy"]["context_is_admin"] %>],
|
||||
"admin_or_owner": [<%= node["openstack"]["block-storage"]["policy"]["admin_or_owner"] %>],
|
||||
"default": [<%= node["openstack"]["block-storage"]["policy"]["default"] %>],
|
||||
|
||||
"admin_api": [<%= node["openstack-block-storage"]["policy"]["admin_api"] %>],
|
||||
"admin_api": [<%= node["openstack"]["block-storage"]["policy"]["admin_api"] %>],
|
||||
|
||||
"volume:create": [],
|
||||
"volume:get_all": [],
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<%= node["openstack-block-storage"]["custom_template_banner"] %>
|
||||
<%= node["openstack"]["block-storage"]["custom_template_banner"] %>
|
||||
|
||||
<% if %w{redhat centos fedora}.include?(node["platform"]) %>
|
||||
include /var/lib/cinder/volumes/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue