Rename roles to manifests

With the goal to transform this work in a complete puppet module,
this patch aims to rename roles to manifests.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-12-28 10:27:42 +01:00
parent 91d29b239a
commit 4bcb03551c
41 changed files with 161 additions and 18 deletions

View File

@@ -0,0 +1,55 @@
#
# Copyright (C) 2013 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 Common
#
class os_volume_common(
$cinder_db_host = $os_params::cinder_db_host,
$cinder_db_user = $os_params::cinder_db_user,
$cinder_db_password = $os_params::cinder_db_password,
$rabbit_hosts = $os_params::rabbit_hosts,
$rabbit_password = $os_params::rabbit_password,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host,
$ks_cinder_password = $os_params::ks_cinder_password,
$ks_glance_internal_host = $os_params::ks_glance_internal_host,
$verbose = $os_params::verbose,
$debug = $os_params::debug,
) {
$encoded_user = uriescape($cinder_db_user)
$encoded_password = uriescape($cinder_db_password)
class { 'cinder':
sql_connection => "mysql://${encoded_user}:${encoded_password}@${cinder_db_host}/cinder?charset=utf8",
rabbit_userid => 'cinder',
rabbit_hosts => $rabbit_hosts,
rabbit_password => $rabbit_password,
rabbit_virtual_host => '/',
verbose => $verbose,
debug => $debug,
log_facility => 'LOG_LOCAL0',
use_syslog => true
}
class { 'cinder::ceilometer': }
class { 'cinder::glance':
glance_api_servers => $ks_glance_internal_host,
glance_request_timeout => '10'
}
}

View File

@@ -0,0 +1,50 @@
#
# Copyright (C) 2013 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 os_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_swift_internal_proto = $os_params::ks_swift_internal_proto,
$ks_swift_internal_host = $os_params::ks_swift_internal_host,
$ks_swift_internal_port = $os_params::ks_swift_internal_port,
$local_ip = $ipaddress_eth0,
) {
class { 'cinder::scheduler': }
class { 'cinder::api':
keystone_password => $ks_cinder_password,
keystone_auth_host => $ks_keystone_internal_host,
}
class { 'cinder::backup': }
class { 'cinder::backup::swift':
backup_swift_url => "${ks_swift_internal_proto}://${ks_swift_internal_host}:${ks_swift_internal_port}/v1/AUTH"
}
@@haproxy::balancermember{"${::fqdn}-cinder_api":
listening_service => 'cinder_api_cluster',
server_names => $::hostname,
ipaddresses => $local_ip,
ports => $ks_cinder_internal_port,
options => 'check inter 2000 rise 2 fall 5'
}
}

View File

@@ -0,0 +1,28 @@
#
# Copyright (C) 2013 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 storage
#
class os_volume_storage {
class { 'cinder::volume::rbd':
rbd_pool => $os_params::cinder_rbd_pool,
glance_api_version => $os_params::glance_api_version,
rbd_user => $os_params::cinder_rbd_user,
rbd_secret_uuid => $os_params::cinder_rbd_secret_uuid
}
}