d0aee23dae
The previous change[1] migrated some parameters related cinder
from nova to nova::cinder, but cross_az_attach shouldn't be migrate
because the parameter is used in nova-api and nova-compute and in some
cases nova::cinder class is not actually loaded in api side.
(We actually don't include nova::cinder for controllers in TripleO)
This patch partially reverts the change by [1], so that we keep
cross_az_attach in more common place, which is surely loaded in
both control plane and hypervisor.
[1] 72103db985
Change-Id: I2e07e29740cf0398b4f34457b53d54890b4aa843
98 lines
3.5 KiB
Puppet
98 lines
3.5 KiB
Puppet
# == Class: nova::cinder
|
|
#
|
|
# Configures Cinder credentials to use by Nova.
|
|
#
|
|
# === Parameters:
|
|
#
|
|
# [*password*]
|
|
# (required) Password for connecting to Cinder services in
|
|
# admin context through the OpenStack Identity service.
|
|
# Defaults to $::os_service_default
|
|
#
|
|
# [*auth_type*]
|
|
# Name of the auth type to load (string value)
|
|
# Defaults to $::os_service_default
|
|
#
|
|
# [*auth_url*]
|
|
# (optional) Points to the OpenStack Identity server IP and port.
|
|
# This is the Identity (keystone) admin API server IP and port value,
|
|
# and not the Identity service API IP and port.
|
|
# Defaults to $::os_service_default
|
|
#
|
|
# [*timeout*]
|
|
# (optional) Timeout value for connecting to cinder in seconds.
|
|
# Defaults to $::os_service_default
|
|
#
|
|
# [*region_name*]
|
|
# (optional) Region name for connecting to cinder in admin context
|
|
# through the OpenStack Identity service.
|
|
# Defaults to $::os_service_default
|
|
#
|
|
# [*project_name*]
|
|
# (optional) Project name for connecting to Cinder services in
|
|
# admin context through the OpenStack Identity service.
|
|
# Defaults to 'services'
|
|
#
|
|
# [*project_domain_name*]
|
|
# (optional) Project Domain name for connecting to Cinder services in
|
|
# admin context through the OpenStack Identity service.
|
|
# Defaults to 'Default'
|
|
#
|
|
# [*username*]
|
|
# (optional) Username for connecting to Cinder services in admin context
|
|
# through the OpenStack Identity service.
|
|
# Defaults to 'cinder'
|
|
#
|
|
# [*user_domain_name*]
|
|
# (optional) User Domain name for connecting to Cinder services in
|
|
# admin context through the OpenStack Identity service.
|
|
# Defaults to 'Default'
|
|
#
|
|
# [*os_region_name*]
|
|
# (optional) Sets the os_region_name flag. For environments with
|
|
# more than one endpoint per service, this is required to make
|
|
# things such as cinder volume attach work. If you don't set this
|
|
# and you have multiple endpoints, you will get AmbiguousEndpoint
|
|
# exceptions in the nova API service.
|
|
# Defaults to $::os_service_default
|
|
#
|
|
# [*catalog_info*]
|
|
# (optional) Info to match when looking for cinder in the service
|
|
# catalog. Format is: separated values of the form:
|
|
# <service_type>:<service_name>:<endpoint_type>
|
|
# Defaults to $::os_service_default
|
|
#
|
|
class nova::cinder (
|
|
$password = $::os_service_default,
|
|
$auth_type = $::os_service_default,
|
|
$auth_url = $::os_service_default,
|
|
$timeout = $::os_service_default,
|
|
$region_name = $::os_service_default,
|
|
$project_name = 'services',
|
|
$project_domain_name = 'Default',
|
|
$username = 'cinder',
|
|
$user_domain_name = 'Default',
|
|
$os_region_name = $::os_service_default,
|
|
$catalog_info = $::os_service_default,
|
|
) {
|
|
|
|
include nova::deps
|
|
|
|
$os_region_name_real = pick($::nova::os_region_name, $os_region_name)
|
|
$catalog_info_real = pick($::nova::cinder_catalog_info, $catalog_info)
|
|
|
|
nova_config {
|
|
'cinder/password': value => $password, secret => true;
|
|
'cinder/auth_type': value => $auth_type;
|
|
'cinder/auth_url': value => $auth_url;
|
|
'cinder/region_name': value => $region_name;
|
|
'cinder/timeout': value => $timeout;
|
|
'cinder/project_name': value => $project_name;
|
|
'cinder/project_domain_name': value => $project_domain_name;
|
|
'cinder/username': value => $username;
|
|
'cinder/user_domain_name': value => $user_domain_name;
|
|
'cinder/os_region_name': value => $os_region_name_real;
|
|
'cinder/catalog_info': value => $catalog_info_real;
|
|
}
|
|
}
|