64617d398c
Duplicate declaration: Cinder_config[DEFAULT/glance_api_version] is declared in file cinder/manifests/glance.pp and cinder/manifests/backend/rbd.pp While https://review.openstack.org/#/c/69756/ got merged, this patch fix the issue. Close #111 Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
68 lines
2.2 KiB
Puppet
68 lines
2.2 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,
|
|
$api_eth = $os_params::api_eth,
|
|
# 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'
|
|
|
|
class { 'cinder::scheduler': }
|
|
|
|
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
|
|
# }
|
|
|
|
# TODO(EmilienM) Disabled for now: http://git.io/uM5sgg
|
|
# class { 'cinder::glance':
|
|
# glance_api_servers => $ks_glance_internal_host,
|
|
# glance_request_timeout => '10'
|
|
# }
|
|
# Replaced by:
|
|
cinder_config {
|
|
'DEFAULT/glance_api_servers': value => $ks_glance_internal_host;
|
|
'DEFAULT/glance_request_timeout': value => '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'
|
|
}
|
|
|
|
}
|