Emilien Macchi fac7521b69 cinder/glance: update to upstream class
Previously, we used to configure Glance connection from Cinder using
cinder_config type which is not the best way now since we have a new
class: cinder::glance with good parameters.

This patch aims to update our module to use this class.

Bug #111
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
2014-03-19 09:21:59 +01:00

73 lines
2.4 KiB
Puppet

#
# Copyright (C) 2014 eNovance SAS <licensing@enovance.com>
#
# 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.
#
# Volume controller
#
class cloud::volume::controller(
$ks_cinder_internal_port = $os_params::ks_cinder_internal_port,
$ks_cinder_password = $os_params::ks_cinder_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port,
$api_eth = $os_params::api_eth,
# Maintain backward compatibility for multi-backend
$volume_multi_backend = false,
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
# $backup_ceph_pool = $os_params::cinder_rbd_backup_pool,
# $backup_ceph_user = $os_params::cinder_rbd_backup_user
) {
include 'cloud::volume'
if ! $volume_multi_backend {
$scheduler_driver_real = false
} else {
$scheduler_driver_real = 'cinder.scheduler.filter_scheduler.FilterScheduler'
}
class { 'cinder::scheduler':
scheduler_driver => $scheduler_driver_real
}
class { 'cinder::api':
keystone_password => $ks_cinder_password,
keystone_auth_host => $ks_keystone_internal_host,
bind_host => $api_eth
}
class { 'cinder::backup': }
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
# class { 'cinder::backup::ceph':
# backup_ceph_user => $backup_ceph_user,
# backup_ceph_pool => $backup_ceph_pool
# }
class { 'cinder::glance':
glance_api_servers => "${ks_glance_internal_host}:${ks_glance_api_internal_port}",
glance_request_timeout => '10'
}
@@haproxy::balancermember{"${::fqdn}-cinder_api":
listening_service => 'cinder_api_cluster',
server_names => $::hostname,
ipaddresses => $api_eth,
ports => $ks_cinder_internal_port,
options => 'check inter 2000 rise 2 fall 5'
}
}