afa0ed8122
When running Keystone in WSGI, Glance_image is not run in the right moment. This patch aims to make sure Glance_image is run after creating Glance endpoint Keystone resource by using the Puppet chain arrow. Keystone_endpoint is actually the latest resource created by Keystone providers to make Glance working. If Glance_image resource is in the catalog, it will be executed when keystone & glance are actually ready and not before. Closes-Bug: #1488277 Change-Id: I97d1a77c5f4a67914738514d773ecbd4bfb2196c
211 lines
6.6 KiB
Puppet
211 lines
6.6 KiB
Puppet
# == Class: glance::keystone::auth
|
|
#
|
|
# Sets up glance users, service and endpoint
|
|
#
|
|
# == Parameters:
|
|
#
|
|
# [*password*]
|
|
# Password for glance user. Required.
|
|
#
|
|
# [*email*]
|
|
# Email for glance user. Optional. Defaults to 'glance@localhost'.
|
|
#
|
|
# [*auth_name*]
|
|
# Username for glance service. Optional. Defaults to 'glance'.
|
|
#
|
|
# [*configure_endpoint*]
|
|
# Should glance endpoint be configured? Optional. Defaults to 'true'.
|
|
#
|
|
# [*configure_user*]
|
|
# Should the service user be configured? Optional. Defaults to 'true'.
|
|
#
|
|
# [*configure_user_role*]
|
|
# Should the admin role be configured for the service user?
|
|
# Optional. Defaults to 'true'.
|
|
#
|
|
# [*service_name*]
|
|
# Name of the service. Optional.
|
|
# Defaults to value of auth_name.
|
|
#
|
|
# [*service_type*]
|
|
# Type of service. Optional. Defaults to 'image'.
|
|
#
|
|
# [*service_description*]
|
|
# Description for keystone service. Optional. Defaults to 'OpenStack Image Service'.
|
|
#
|
|
# [*region*]
|
|
# Region for endpoint. Optional. Defaults to 'RegionOne'.
|
|
#
|
|
# [*tenant*]
|
|
# Tenant for glance user. Optional. Defaults to 'services'.
|
|
#
|
|
# [*public_url*]
|
|
# (optional) The endpoint's public url. (Defaults to 'http://127.0.0.1:9292')
|
|
# This url should *not* contain any trailing '/'.
|
|
#
|
|
# [*admin_url*]
|
|
# (optional) The endpoint's admin url. (Defaults to 'http://127.0.0.1:9292')
|
|
# This url should *not* contain any trailing '/'.
|
|
#
|
|
# [*internal_url*]
|
|
# (optional) The endpoint's internal url. (Defaults to 'http://127.0.0.1:9292')
|
|
# This url should *not* contain any trailing '/'.
|
|
#
|
|
# [*port*]
|
|
# (optional) DEPRECATED: Use public_url, internal_url and admin_url instead.
|
|
# Default port for endpoints. (Defaults to 9292)
|
|
# Setting this parameter overrides public_url, internal_url and admin_url parameters.
|
|
#
|
|
# [*public_protocol*]
|
|
# (optional) DEPRECATED: Use public_url instead.
|
|
# Protocol for public endpoint. (Defaults to 'http')
|
|
# Setting this parameter overrides public_url parameter.
|
|
#
|
|
# [*public_address*]
|
|
# (optional) DEPRECATED: Use public_url instead.
|
|
# Public address for endpoint. (Defaults to '127.0.0.1')
|
|
# Setting this parameter overrides public_url parameter.
|
|
#
|
|
# [*internal_protocol*]
|
|
# (optional) DEPRECATED: Use internal_url instead.
|
|
# Protocol for internal endpoint. (Defaults to 'http')
|
|
# Setting this parameter overrides internal_url parameter.
|
|
#
|
|
# [*internal_address*]
|
|
# (optional) DEPRECATED: Use internal_url instead.
|
|
# Internal address for endpoint. (Defaults to '127.0.0.1')
|
|
# Setting this parameter overrides internal_url parameter.
|
|
#
|
|
# [*admin_protocol*]
|
|
# (optional) DEPRECATED: Use admin_url instead.
|
|
# Protocol for admin endpoint. (Defaults to 'http')
|
|
# Setting this parameter overrides admin_url parameter.
|
|
#
|
|
# [*admin_address*]
|
|
# (optional) DEPRECATED: Use admin_url instead.
|
|
# Admin address for endpoint. (Defaults to '127.0.0.1')
|
|
# Setting this parameter overrides admin_url parameter.
|
|
#
|
|
# === Deprecation notes
|
|
#
|
|
# If any value is provided for public_protocol, public_address or port parameters,
|
|
# public_url will be completely ignored. The same applies for internal and admin parameters.
|
|
#
|
|
# === Examples
|
|
#
|
|
# class { 'glance::keystone::auth':
|
|
# public_url => 'https://10.0.0.10:9292',
|
|
# internal_url => 'https://10.0.0.11:9292',
|
|
# admin_url => 'https://10.0.0.11:9292',
|
|
# }
|
|
#
|
|
class glance::keystone::auth(
|
|
$password,
|
|
$email = 'glance@localhost',
|
|
$auth_name = 'glance',
|
|
$configure_endpoint = true,
|
|
$configure_user = true,
|
|
$configure_user_role = true,
|
|
$service_name = undef,
|
|
$service_type = 'image',
|
|
$region = 'RegionOne',
|
|
$tenant = 'services',
|
|
$service_description = 'OpenStack Image Service',
|
|
$public_url = 'http://127.0.0.1:9292',
|
|
$admin_url = 'http://127.0.0.1:9292',
|
|
$internal_url = 'http://127.0.0.1:9292',
|
|
# DEPRECATED PARAMETERS
|
|
$port = undef,
|
|
$public_protocol = undef,
|
|
$public_address = undef,
|
|
$internal_protocol = undef,
|
|
$internal_address = undef,
|
|
$admin_protocol = undef,
|
|
$admin_address = undef,
|
|
) {
|
|
|
|
if $port {
|
|
warning('The port parameter is deprecated, use public_url, internal_url and admin_url instead.')
|
|
}
|
|
|
|
if $public_protocol {
|
|
warning('The public_protocol parameter is deprecated, use public_url instead.')
|
|
}
|
|
|
|
if $internal_protocol {
|
|
warning('The internal_protocol parameter is deprecated, use internal_url instead.')
|
|
}
|
|
|
|
if $admin_protocol {
|
|
warning('The admin_protocol parameter is deprecated, use admin_url instead.')
|
|
}
|
|
|
|
if $public_address {
|
|
warning('The public_address parameter is deprecated, use public_url instead.')
|
|
}
|
|
|
|
if $internal_address {
|
|
warning('The internal_address parameter is deprecated, use internal_url instead.')
|
|
}
|
|
|
|
if $admin_address {
|
|
warning('The admin_address parameter is deprecated, use admin_url instead.')
|
|
}
|
|
|
|
if ($public_protocol or $public_address or $port) {
|
|
$public_url_real = sprintf('%s://%s:%s',
|
|
pick($public_protocol, 'http'),
|
|
pick($public_address, '127.0.0.1'),
|
|
pick($port, '9292'))
|
|
} else {
|
|
$public_url_real = $public_url
|
|
}
|
|
|
|
if ($admin_protocol or $admin_address or $port) {
|
|
$admin_url_real = sprintf('%s://%s:%s',
|
|
pick($admin_protocol, 'http'),
|
|
pick($admin_address, '127.0.0.1'),
|
|
pick($port, '9292'))
|
|
} else {
|
|
$admin_url_real = $admin_url
|
|
}
|
|
|
|
if ($internal_protocol or $internal_address or $port) {
|
|
$internal_url_real = sprintf('%s://%s:%s',
|
|
pick($internal_protocol, 'http'),
|
|
pick($internal_address, '127.0.0.1'),
|
|
pick($port, '9292'))
|
|
} else {
|
|
$internal_url_real = $internal_url
|
|
}
|
|
|
|
$real_service_name = pick($service_name, $auth_name)
|
|
|
|
if $configure_endpoint {
|
|
Keystone_endpoint["${region}/${real_service_name}"] ~> Service <| name == 'glance-api' |>
|
|
Keystone_endpoint["${region}/${real_service_name}"] -> Glance_image<||>
|
|
}
|
|
|
|
keystone::resource::service_identity { $auth_name:
|
|
configure_user => $configure_user,
|
|
configure_user_role => $configure_user_role,
|
|
configure_endpoint => $configure_endpoint,
|
|
service_type => $service_type,
|
|
service_description => $service_description,
|
|
service_name => $real_service_name,
|
|
region => $region,
|
|
password => $password,
|
|
email => $email,
|
|
tenant => $tenant,
|
|
public_url => $public_url_real,
|
|
admin_url => $admin_url_real,
|
|
internal_url => $internal_url_real,
|
|
}
|
|
|
|
if $configure_user_role {
|
|
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-registry' |>
|
|
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'glance-api' |>
|
|
}
|
|
|
|
}
|