stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #304 from enovance/bug/1/spredzy

Browse Source 
Set default parameters in order to migrate to hiera
This commit is contained in:
Yanis Guenane
2014-04-23 20:29:17 -04:00
parent 8156a45744 ce6402369f
commit 09a25f2393
35 changed files with 515 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cache.pp
View File

@@ -21,11 +21,11 @@
# #
# [*listen_ip*] # [*listen_ip*]
# (optional) IP address on which memcached instance should listen # (optional) IP address on which memcached instance should listen
# Default in params. # Defaults to '127.0.0.1'
# #
class cloud::cache ( class cloud::cache (
$listen_ip = $os_params::internal_netif_ip, $listen_ip = '127.0.0.1',
){ ){
class { 'memcached': class { 'memcached':

58
manifests/compute.pp
View File

@@ -21,71 +21,71 @@
# #
# [*nova_db_host*] # [*nova_db_host*]
# (optional) Hostname or IP address to connect to nova database # (optional) Hostname or IP address to connect to nova database
# Default value in params # Defaults to '127.0.0.1'
# #
# [*nova_db_user*] # [*nova_db_user*]
# (optional) Username to connect to nova database # (optional) Username to connect to nova database
# Default value in params # Defaults to 'nova'
# #
# [*nova_db_password*] # [*nova_db_password*]
# (optional) Password to connect to nova database # (optional) Password to connect to nova database
# Default value in params # Defaults to 'novapassword'
# #
# [*rabbit_hosts*] # [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to ['127.0.0.1:5672']
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to nova queues. # (optional) Password to connect to nova queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*ks_glance_internal_host*] # [*ks_glance_internal_host*]
# (optional) Internal Hostname or IP to connect to Glance API # (optional) Internal Hostname or IP to connect to Glance API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*glance_api_port*] # [*glance_api_port*]
# (optional) TCP port to connect to Glance API # (optional) TCP port to connect to Glance API
# Default value in params # Defaults to '9292'
# #
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Default value in params # Defaults to true
# #
# [*debug*] # [*debug*]
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # Defaults to true
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
# [*memcache_servers*] # [*memcache_servers*]
# (optionnal) Memcached servers used by Keystone. Should be an array. # (optionnal) Memcached servers used by Keystone. Should be an array.
# Default value in params # Defaults to ['127.0.0.1:11211']
# #
class cloud::compute( class cloud::compute(
$nova_db_host = $os_params::nova_db_host, $nova_db_host = '127.0.0.1',
$nova_db_user = $os_params::nova_db_user, $nova_db_user = 'nova',
$nova_db_password = $os_params::nova_db_password, $nova_db_password = 'novapassword',
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword',
$ks_glance_internal_host = $os_params::ks_glance_internal_host, $ks_glance_internal_host = '127.0.0.1',
$glance_api_port = $os_params::ks_glance_api_internal_port, $glance_api_port = 9292,
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$use_syslog = $os_params::use_syslog, $use_syslog = true,
$log_facility = $os_params::log_facility, $log_facility = 'LOG_LOCAL0',
$neutron_endpoint = $os_params::ks_neutron_admin_host, $neutron_endpoint = '127.0.0.1',
$neutron_protocol = $os_params::ks_neutron_admin_proto, $neutron_protocol = 'http',
$neutron_password = $os_params::ks_neutron_password, $neutron_password = 'neutronpassword',
$neutron_region_name = $os_params::region, $neutron_region_name = 'RegionOne',
$memcache_servers = $os_params::memcache_servers, $memcache_servers = ['127.0.0.1:11211'],
$availability_zone = $os_params::region $availability_zone = 'RegionOne'
) { ) {
if !defined(Resource['nova_config']) { if !defined(Resource['nova_config']) {

16
manifests/compute/controller.pp
View File

@@ -17,14 +17,14 @@
# #
class cloud::compute::controller( class cloud::compute::controller(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_nova_password = $os_params::ks_nova_password, $ks_nova_password = 'novapassword',
$neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, $neutron_metadata_proxy_shared_secret = 'asecreteaboutneutron',
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$spice_port = $os_params::spice_port, $spice_port = 6082,
$ks_nova_public_port = $os_params::ks_nova_public_port, $ks_nova_public_port = 8774,
$ks_ec2_public_port = $os_params::ks_ec2_public_port, $ks_ec2_public_port = 8773,
$ks_metadata_public_port = $os_params::ks_metadata_public_port $ks_metadata_public_port = 8775
){ ){
include 'cloud::compute' include 'cloud::compute'

20
manifests/compute/hypervisor.pp
View File

@@ -27,16 +27,16 @@
# #
class cloud::compute::hypervisor( class cloud::compute::hypervisor(
$server_proxyclient_address = $os_params::internal_netif_ip, $server_proxyclient_address = '127.0.0.1',
$libvirt_type = $os_params::libvirt_type, $libvirt_type = 'kvm',
$ks_nova_public_proto = $os_params::ks_nova_public_proto, $ks_nova_public_proto = 'http',
$ks_nova_public_host = $os_params::ks_nova_public_host, $ks_nova_public_host = '127.0.0.1',
$nova_ssh_private_key = $os_params::nova_ssh_private_key, $nova_ssh_private_key = undef,
$nova_ssh_public_key = $os_params::nova_ssh_public_key, $nova_ssh_public_key = undef,
$spice_port = $os_params::spice_port, $spice_port = 6082,
$cinder_rbd_user = $os_params::cinder_rbd_user, $cinder_rbd_user = 'cinder',
$nova_rbd_pool = $os_params::nova_rbd_pool, $nova_rbd_pool = 'volumes',
$nova_rbd_secret_uuid = $os_params::ceph_fsid, $nova_rbd_secret_uuid = undef,
$has_ceph = false $has_ceph = false
) { ) {

32
manifests/dashboard.pp
View File

@@ -21,20 +21,20 @@
# #
# [*ks_keystone_internal_host*] # [*ks_keystone_internal_host*]
# (optional) Internal address for endpoint. # (optional) Internal address for endpoint.
# Default value in params # Defaults to '127.0.0.1'
# #
# [*secret_key*] # [*secret_key*]
# (optional) Secret key. This is used by Django to provide cryptographic # (optional) Secret key. This is used by Django to provide cryptographic
# signing, and should be set to a unique, unpredictable value. # signing, and should be set to a unique, unpredictable value.
# Default value in params # Defaults to 'secrete'
# #
# [*horizon_port*] # [*horizon_port*]
# (optional) Port used to connect to OpenStack Dashboard # (optional) Port used to connect to OpenStack Dashboard
# Default value in params # Defaults to '80'
# #
# [*api_eth*] # [*api_eth*]
# (optional) Which interface we bind the Horizon server. # (optional) Which interface we bind the Horizon server.
# Default value in params # Defaults to '127.0.0.1'
# #
# [*servername*] # [*servername*]
# (optional) DNS name used to connect to Openstack Dashboard. # (optional) DNS name used to connect to Openstack Dashboard.
@@ -47,19 +47,19 @@
# #
# [*keystone_proto*] # [*keystone_proto*]
# (optional) Protocol (http or https) of keystone endpoint. # (optional) Protocol (http or https) of keystone endpoint.
#  Defaults to params. #  Defaults to 'http'
# #
# [*keystone_host*] # [*keystone_host*]
# (optional) IP / Host of keystone endpoint. # (optional) IP / Host of keystone endpoint.
#  Defaults to params. #  Defaults '127.0.0.1'
# #
# [*keystone_port*] # [*keystone_port*]
# (optional) TCP port of keystone endpoint. # (optional) TCP port of keystone endpoint.
#  Defaults to params. #  Defaults to '5000'
# #
# [*debug*] # [*debug*]
# (optional) Enable debug or not. # (optional) Enable debug or not.
#  Defaults to params. #  Defaults to true
# #
# [*listen_ssl*] # [*listen_ssl*]
# (optional) Enable SSL support in Apache. (Defaults to false) # (optional) Enable SSL support in Apache. (Defaults to false)
@@ -75,16 +75,16 @@
# #
class cloud::dashboard( class cloud::dashboard(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$secret_key = $os_params::secret_key, $secret_key = 'secrete',
$horizon_port = $os_params::horizon_port, $horizon_port = 80,
$api_eth = $os_params::api_eth,
$servername = $::fqdn, $servername = $::fqdn,
$api_eth = '127.0.0.1',
$listen_ssl = false, $listen_ssl = false,
$keystone_host = $os_params::ks_keystone_internal_host, $keystone_host = '127.0.0.1',
$keystone_proto = $os_params::ks_keystone_internal_proto, $keystone_proto = 'http',
$keystone_port = $os_params::ks_keystone_internal_port, $keystone_port = 5000,
$debug = $os_params::debug, $debug = true,
$listen_ssl = false, $listen_ssl = false,
$horizon_cert = undef, $horizon_cert = undef,
$horizon_key = undef, $horizon_key = undef,

17
manifests/database/nosql.pp
View File

@@ -21,7 +21,7 @@
# #
# [*bind_ip*] # [*bind_ip*]
# (optional) IP address on which mongod instance should listen # (optional) IP address on which mongod instance should listen
# Defaults in params # Defaults to '127.0.0.1'
# #
# [*nojournal*] # [*nojournal*]
# (optional) Disable mongodb internal cache. This is not recommended for # (optional) Disable mongodb internal cache. This is not recommended for
@@ -32,23 +32,24 @@
# [*replset_members*] # [*replset_members*]
# (optional) Ceilometer Replica set members hostnames # (optional) Ceilometer Replica set members hostnames
# Should be an array. Example: ['node1', 'node2', node3'] # Should be an array. Example: ['node1', 'node2', node3']
# Default value in params # Defaults to hostname
# #
class cloud::database::nosql( class cloud::database::nosql(
$bind_ip = $os_params::internal_netif_ip, $bind_ip = '127.0.0.1',
$nojournal = false, $nojournal = false,
$replset_members = $os_params::mongo_nodes $replset_members = $::hostname
) { ) {
# bind_ip should be an array # should be an array
$bind_ip_real = any2array($bind_ip) $array_bind_ip = any2array($bind_ip)
$array_replset_members = any2array($replset_members)
class { 'mongodb::globals': class { 'mongodb::globals':
manage_package_repo => true manage_package_repo => true
}-> }->
class { 'mongodb': class { 'mongodb':
bind_ip => $bind_ip_real, bind_ip => $array_bind_ip,
nojournal => $nojournal, nojournal => $nojournal,
replset => 'ceilometer', replset => 'ceilometer',
} }
@@ -62,7 +63,7 @@ class cloud::database::nosql(
} }
mongodb_replset{'ceilometer': mongodb_replset{'ceilometer':
members => $replset_members, members => $array_replset_members,
before => Anchor['mongodb setup done'], before => Anchor['mongodb setup done'],
} }

68
manifests/database/sql.pp
View File

@@ -19,40 +19,43 @@
# #
# [*galera_internal_ips*] # [*galera_internal_ips*]
# Array of internal ip of the galera nodes. # Array of internal ip of the galera nodes.
# Defaults to ['127.0.0.1']
#
class cloud::database::sql ( class cloud::database::sql (
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$service_provider = 'sysv', $service_provider = 'sysv',
$galera_master_name = $os_params::galera_master_name, $galera_master_name = 'mgmt001',
$galera_internal_ips = $os_params::galera_internal_ips, $galera_internal_ips = ['127.0.0.1'],
$keystone_db_host = $os_params::keystone_db_host, $keystone_db_host = '127.0.0.1',
$keystone_db_user = $os_params::keystone_db_user, $keystone_db_user = 'keystone',
$keystone_db_password = $os_params::keystone_db_password, $keystone_db_password = 'keystonepassword',
$keystone_db_allowed_hosts = $os_params::keystone_db_allowed_hosts, $keystone_db_allowed_hosts = ['127.0.0.1'],
$cinder_db_host = $os_params::cinder_db_host, $cinder_db_host = '127.0.0.1',
$cinder_db_user = $os_params::cinder_db_user, $cinder_db_user = 'cinder',
$cinder_db_password = $os_params::cinder_db_password, $cinder_db_password = 'cinderpassword',
$cinder_db_allowed_hosts = $os_params::cinder_db_allowed_hosts, $cinder_db_allowed_hosts = ['127.0.0.1'],
$glance_db_host = $os_params::glance_db_host, $glance_db_host = '127.0.0.1',
$glance_db_user = $os_params::glance_db_user, $glance_db_user = 'glance',
$glance_db_password = $os_params::glance_db_password, $glance_db_password = 'glancepassword',
$glance_db_allowed_hosts = $os_params::glance_db_allowed_hosts, $glance_db_allowed_hosts = ['127.0.0.1'],
$heat_db_host = $os_params::heat_db_host, $heat_db_host = '127.0.0.1',
$heat_db_user = $os_params::heat_db_user, $heat_db_user = 'heat',
$heat_db_password = $os_params::heat_db_password, $heat_db_password = 'heatpassword',
$heat_db_allowed_hosts = $os_params::heat_db_allowed_hosts, $heat_db_allowed_hosts = ['127.0.0.1'],
$nova_db_host = $os_params::nova_db_host, $nova_db_host = '127.0.0.1',
$nova_db_user = $os_params::nova_db_user, $nova_db_user = 'nova',
$nova_db_password = $os_params::nova_db_password, $nova_db_password = 'novapassword',
$nova_db_allowed_hosts = $os_params::nova_db_allowed_hosts, $nova_db_allowed_hosts = ['127.0.0.1'],
$neutron_db_host = $os_params::neutron_db_host, $neutron_db_host = '127.0.0.1',
$neutron_db_user = $os_params::neutron_db_user, $neutron_db_user = 'neutron',
$neutron_db_password = $os_params::neutron_db_password, $neutron_db_password = 'neutronpassword',
$neutron_db_allowed_hosts = $os_params::neutron_db_allowed_hosts, $neutron_db_allowed_hosts = ['127.0.0.1'],
$mysql_root_password = $os_params::mysql_root_password, $mysql_root_password = 'rootpassword',
$mysql_sys_maint_password = $os_params::mysql_sys_maint_password, $mysql_sys_maint_password = 'sys_maint',
$galera_clustercheck_dbuser = $os_params::galera_clustercheck_dbuser, $galera_clustercheck_dbuser = 'clustercheckdbuser',
$galera_clustercheck_dbpassword = $os_params::galera_clustercheck_dbpassword, $galera_clustercheck_dbpassword = 'clustercheckpassword',
$galera_clustercheck_ipaddress = $os_params::internal_netif_ip $galera_clustercheck_ipaddress = '127.0.0.1'
) { ) {
include 'xinetd' include 'xinetd'
@@ -65,7 +68,6 @@ class cloud::database::sql (
$mysql_service_name = 'mysql' $mysql_service_name = 'mysql'
} }
# TODO(Gonéri): OS/values detection should be moved in a params.pp
case $::osfamily { case $::osfamily {
'RedHat': { 'RedHat': {
class { 'mysql': class { 'mysql':

298
manifests/identity.pp
View File

@@ -21,303 +21,294 @@
# #
# [*identity_roles_addons*] # [*identity_roles_addons*]
# (optional) Extra keystone roles to create # (optional) Extra keystone roles to create
# Default value in params # Defaults to ['SwiftOperator', 'ResellerAdmin']
# #
# [*keystone_db_host*] # [*keystone_db_host*]
# (optional) Hostname or IP address to connect to keystone database # (optional) Hostname or IP address to connect to keystone database
# Default value in params # Defaults to '127.0.0.1'
# #
# [*keystone_db_user*] # [*keystone_db_user*]
# (optional) Username to connect to keystone database # (optional) Username to connect to keystone database
# Default value in params # Defaults to 'keystone'
# #
# [*keystone_db_password*] # [*keystone_db_password*]
# (optional) Password to connect to keystone database # (optional) Password to connect to keystone database
# Default value in params # Defaults to 'keystonepassword'
# #
# [*ks_admin_email*] # [*ks_admin_email*]
# (optional) Email address of admin user in Keystone # (optional) Email address of admin user in Keystone
# Default value in params # Defaults to 'no-reply@keystone.openstack'
# #
# [*ks_admin_password*] # [*ks_admin_password*]
# (optional) Password of admin user in Keystone # (optional) Password of admin user in Keystone
# Default value in params # Defaults to 'adminpassword'
# #
# [*ks_admin_tenant*] # [*ks_admin_tenant*]
# (optional) Admin tenant name in Keystone # (optional) Admin tenant name in Keystone
# Default value in params # Defaults to 'admin'
# #
# [*ks_admin_token*] # [*ks_admin_token*]
# (optional) Admin token used by Keystone. # (required) Admin token used by Keystone.
# Default value in params
# #
# [*ks_glance_internal_host*] # [*ks_glance_internal_host*]
# (optional) Internal Hostname or IP to connect to Glance API # (optional) Internal Hostname or IP to connect to Glance API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_glance_admin_host*] # [*ks_glance_admin_host*]
# (optional) Admin Hostname or IP to connect to Glance API # (optional) Admin Hostname or IP to connect to Glance API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_glance_public_host*] # [*ks_glance_public_host*]
# (optional) Public Hostname or IP to connect to Glance API # (optional) Public Hostname or IP to connect to Glance API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_ceilometer_internal_host*] # [*ks_ceilometer_internal_host*]
# (optional) Internal Hostname or IP to connect to Ceilometer API # (optional) Internal Hostname or IP to connect to Ceilometer API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_ceilometer_admin_host*] # [*ks_ceilometer_admin_host*]
# (optional) Admin Hostname or IP to connect to Ceilometer API # (optional) Admin Hostname or IP to connect to Ceilometer API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_ceilometer_public_host*] # [*ks_ceilometer_public_host*]
# (optional) Public Hostname or IP to connect to Ceilometer API # (optional) Public Hostname or IP to connect to Ceilometer API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_internal_host*] # [*ks_keystone_internal_host*]
# (optional) Internal Hostname or IP to connect to Keystone API # (optional) Internal Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_admin_host*] # [*ks_keystone_admin_host*]
# (optional) Admin Hostname or IP to connect to Keystone API # (optional) Admin Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_public_host*] # [*ks_keystone_public_host*]
# (optional) Public Hostname or IP to connect to Keystone API # (optional) Public Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_nova_internal_host*] # [*ks_nova_internal_host*]
# (optional) Internal Hostname or IP to connect to Nova API # (optional) Internal Hostname or IP to connect to Nova API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_nova_admin_host*] # [*ks_nova_admin_host*]
# (optional) Admin Hostname or IP to connect to Nova API # (optional) Admin Hostname or IP to connect to Nova API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_nova_public_host*] # [*ks_nova_public_host*]
# (optional) Public Hostname or IP to connect to Nova API # (optional) Public Hostname or IP to connect to Nova API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_cinder_internal_host*] # [*ks_cinder_internal_host*]
# (optional) Internal Hostname or IP to connect to Cinder API # (optional) Internal Hostname or IP to connect to Cinder API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_cinder_admin_host*] # [*ks_cinder_admin_host*]
# (optional) Admin Hostname or IP to connect to Cinder API # (optional) Admin Hostname or IP to connect to Cinder API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_cinder_public_host*] # [*ks_cinder_public_host*]
# (optional) Public Hostname or IP to connect to Cinder API # (optional) Public Hostname or IP to connect to Cinder API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_neutron_internal_host*] # [*ks_neutron_internal_host*]
# (optional) Internal Hostname or IP to connect to Neutron API # (optional) Internal Hostname or IP to connect to Neutron API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_neutron_admin_host*] # [*ks_neutron_admin_host*]
# (optional) Admin Hostname or IP to connect to Neutron API # (optional) Admin Hostname or IP to connect to Neutron API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_neutron_public_host*] # [*ks_neutron_public_host*]
# (optional) Public Hostname or IP to connect to Neutron API # (optional) Public Hostname or IP to connect to Neutron API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_heat_internal_host*] # [*ks_heat_internal_host*]
# (optional) Internal Hostname or IP to connect to Heat API # (optional) Internal Hostname or IP to connect to Heat API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_heat_admin_host*] # [*ks_heat_admin_host*]
# (optional) Admin Hostname or IP to connect to Heat API # (optional) Admin Hostname or IP to connect to Heat API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_heat_public_host*] # [*ks_heat_public_host*]
# (optional) Public Hostname or IP to connect to Heat API # (optional) Public Hostname or IP to connect to Heat API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_swift_internal_host*] # [*ks_swift_internal_host*]
# (optional) Internal Hostname or IP to connect to Swift API # (optional) Internal Hostname or IP to connect to Swift API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_swift_admin_host*] # [*ks_swift_admin_host*]
# (optional) Admin Hostname or IP to connect to Swift API # (optional) Admin Hostname or IP to connect to Swift API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_swift_public_host*] # [*ks_swift_public_host*]
# (optional) Public Hostname or IP to connect to Swift API # (optional) Public Hostname or IP to connect to Swift API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_ceilometer_password*] # [*ks_ceilometer_password*]
# (optional) Password used by Ceilometer to connect to Keystone API # (optional) Password used by Ceilometer to connect to Keystone API
# Default value in params # Defaults to 'ceilometerpassword'
# #
# [*ks_swift_password*] # [*ks_swift_password*]
# (optional) Password used by Swift to connect to Keystone API # (optional) Password used by Swift to connect to Keystone API
# Default value in params # Defaults to 'swiftpassword'
# #
# [*ks_nova_password*] # [*ks_nova_password*]
# (optional) Password used by Nova to connect to Keystone API # (optional) Password used by Nova to connect to Keystone API
# Default value in params # Defaults to 'novapassword'
# #
# [*ks_neutron_password*] # [*ks_neutron_password*]
# (optional) Password used by Neutron to connect to Keystone API # (optional) Password used by Neutron to connect to Keystone API
# Default value in params # Defaults to 'neutronpassword'
# #
# [*ks_heat_password*] # [*ks_heat_password*]
# (optional) Password used by Heat to connect to Keystone API # (optional) Password used by Heat to connect to Keystone API
# Default value in params # Defaults to 'heatpassword'
# #
# [*ks_glance_password*] # [*ks_glance_password*]
# (optional) Password used by Glance to connect to Keystone API # (optional) Password used by Glance to connect to Keystone API
# Default value in params # Defaults to 'glancepassword'
# #
# [*ks_cinder_password*] # [*ks_cinder_password*]
# (optional) Password used by Cinder to connect to Keystone API # (optional) Password used by Cinder to connect to Keystone API
# Default value in params # Defaults to 'cinderpassword'
# #
# [*ks_swift_public_proto*] # [*ks_swift_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_ceilometer_public_proto*] # [*ks_ceilometer_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_heat_public_proto*] # [*ks_heat_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_nova_public_proto*] # [*ks_nova_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_neutron_public_proto*] # [*ks_neutron_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_glance_public_proto*] # [*ks_glance_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_cinder_public_proto*] # [*ks_cinder_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_ceilometer_public_port*] # [*ks_ceilometer_public_port*]
# (optional) TCP port to connect to Ceilometer API from public network # (optional) TCP port to connect to Ceilometer API from public network
# Default value in params # Defaults to '8777'
# #
# [*ks_ceilometer_admin_port*] # [*ks_ceilometer_admin_port*]
# (optional) TCP port to connect to Ceilometer API from admin network # (optional) TCP port to connect to Ceilometer API from admin network
# Default value in params # Defaults to '8777'
# #
# [*ks_ceilometer_internal_port*] # [*ks_ceilometer_internal_port*]
# (optional) TCP port to connect to Ceilometer API from internal network # (optional) TCP port to connect to Ceilometer API from internal network
# Default value in params # Defaults to '8777'
# #
# [*ks_keystone_internal_port*] # [*ks_keystone_internal_port*]
# (optional) TCP port to connect to Keystone API from internal network # (optional) TCP port to connect to Keystone API from internal network
# Default value in params # Defaults to '5000'
# #
# [*ks_keystone_public_port*] # [*ks_keystone_public_port*]
# (optional) TCP port to connect to Keystone API from public network # (optional) TCP port to connect to Keystone API from public network
# Default value in params # Defaults to '5000'
# #
# [*ks_keystone_admin_port*] # [*ks_keystone_admin_port*]
# (optional) TCP port to connect to Keystone API from admin network # (optional) TCP port to connect to Keystone API from admin network
# Default value in params # Defaults to '35357'
# #
# [*ks_swift_public_port*] # [*ks_swift_public_port*]
# (optional) TCP port to connect to Swift API from public network # (optional) TCP port to connect to Swift API from public network
# Default value in params # Defaults to '8080'
# #
# [*ks_nova_internal_port*] # [*ks_nova_internal_port*]
# (optional) TCP port to connect to Nova API from internal network # (optional) TCP port to connect to Nova API from internal network
# Default value in params # Defaults to '8774'
# #
# [*ks_nova_public_port*] # [*ks_nova_public_port*]
# (optional) TCP port to connect to Nova API from public network # (optional) TCP port to connect to Nova API from public network
# Default value in params # Defaults to '8774'
# #
# [*ks_ec2_public_port*] # [*ks_ec2_public_port*]
# (optional) TCP port to connect to EC2 API from public network # (optional) TCP port to connect to EC2 API from public network
# Default value in params # Defaults to '8773'
# #
# [*ks_nova_admin_port*] # [*ks_nova_admin_port*]
# (optional) TCP port to connect to Nova API from admin network # (optional) TCP port to connect to Nova API from admin network
# Default value in params # Defaults to '8774'
# #
# [*ks_cinder_internal_port*] # [*ks_cinder_internal_port*]
# (optional) TCP port to connect to Cinder API from internal network # (optional) TCP port to connect to Cinder API from internal network
# Default value in params # Defaults to '8776'
# #
# [*ks_cinder_public_port*] # [*ks_cinder_public_port*]
# (optional) TCP port to connect to Cinder API from public network # (optional) TCP port to connect to Cinder API from public network
# Default value in params # Defaults to '8776'
# #
# [*ks_cinder_admin_port*] # [*ks_cinder_admin_port*]
# (optional) TCP port to connect to Cinder API from admin network # (optional) TCP port to connect to Cinder API from admin network
# Default value in params # Defaults to '8776'
# #
# [*ks_neutron_internal_port*] # [*ks_neutron_internal_port*]
# (optional) TCP port to connect to Neutron API from internal network # (optional) TCP port to connect to Neutron API from internal network
# Default value in params # Defaults to '9696'
# #
# [*ks_neutron_public_port*] # [*ks_neutron_public_port*]
# (optional) TCP port to connect to Neutron API from public network # (optional) TCP port to connect to Neutron API from public network
# Default value in params # Defaults to '9696'
# #
# [*ks_neutron_admin_port*] # [*ks_neutron_admin_port*]
# (optional) TCP port to connect to Neutron API from admin network # (optional) TCP port to connect to Neutron API from admin network
# Default value in params # Defaults to '9696'
#
# [*ks_heat_internal_port*]
# (optional) TCP port to connect to Heat API from internal network
# Default value in params
# #
# [*ks_heat_public_port*] # [*ks_heat_public_port*]
# (optional) TCP port to connect to Heat API from public network # (optional) TCP port to connect to Heat API from public network
# Default value in params # Defaults to '8000'
#
# [*ks_heat_admin_port*]
# (optional) TCP port to connect to Heat API from admin network
# Default value in params
# #
# [*ks_glance_api_internal_port*] # [*ks_glance_api_internal_port*]
# (optional) TCP port to connect to Glance API from internal network # (optional) TCP port to connect to Glance API from internal network
# Default value in params # Defaults to '9292'
# #
# [*ks_glance_api_public_port*] # [*ks_glance_api_public_port*]
# (optional) TCP port to connect to Glance API from public network # (optional) TCP port to connect to Glance API from public network
# Default value in params # Defaults to '9292'
# #
# [*ks_glance_api_admin_port*] # [*ks_glance_api_admin_port*]
# (optional) TCP port to connect to Glance API from admin network # (optional) TCP port to connect to Glance API from admin network
# Default value in params # Defaults to '9292'
# #
# [*api_eth*] # [*api_eth*]
# (optional) Which interface we bind the Keystone server. # (optional) Which interface we bind the Keystone server.
# Default value in params # Defaults to '127.0.0.1'
# #
# [*region*] # [*region*]
# (optional) OpenStack Region Name # (optional) OpenStack Region Name
# Default value in params # Defaults to 'RegionOne'
# #
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Default value in params # Defaults to true
# #
# [*debug*] # [*debug*]
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # Defaults to true
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
# [*token_driver*] # [*token_driver*]
# (optional) Driver to store tokens # (optional) Driver to store tokens
@@ -325,79 +316,80 @@
# #
# [*token_expiration*] # [*token_expiration*]
# (optional) Amount of time a token should remain valid (in seconds) # (optional) Amount of time a token should remain valid (in seconds)
# Defaults value in params # Defaults to '3600' (1 hour)
# #
class cloud::identity ( class cloud::identity (
$swift_enabled = $os_params::swift, $swift_enabled = true,
$identity_roles_addons = $os_params::identity_roles_addons, $identity_roles_addons = ['SwiftOperator', 'ResellerAdmin'],
$keystone_db_host = $os_params::keystone_db_host, $keystone_db_host = '127.0.0.1',
$keystone_db_user = $os_params::keystone_db_user, $keystone_db_user = 'keystone',
$keystone_db_password = $os_params::keystone_db_password, $keystone_db_password = 'keystonepassword',
$ks_admin_email = $os_params::ks_admin_email, $memcache_servers = ['127.0.0.1:11211'],
$ks_admin_password = $os_params::ks_admin_password, $ks_admin_email = 'no-reply@keystone.openstack',
$ks_admin_tenant = $os_params::ks_admin_tenant, $ks_admin_password = 'adminpassword',
$ks_admin_token = $os_params::ks_admin_token, $ks_admin_tenant = 'admin',
$ks_ceilometer_admin_host = $os_params::ks_ceilometer_admin_host, $ks_admin_token = undef,
$ks_ceilometer_internal_host = $os_params::ks_ceilometer_internal_host, $ks_ceilometer_admin_host = '127.0.0.1',
$ks_ceilometer_password = $os_params::ks_ceilometer_password, $ks_ceilometer_internal_host = '127.0.0.1',
$ks_ceilometer_public_host = $os_params::ks_ceilometer_public_host, $ks_ceilometer_password = 'ceilometerpassword',
$ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port, $ks_ceilometer_public_host = '127.0.0.1',
$ks_ceilometer_public_proto = $os_params::ks_ceilometer_public_proto, $ks_ceilometer_public_port = 8777,
$ks_cinder_admin_host = $os_params::ks_cinder_admin_host, $ks_ceilometer_public_proto = 'http',
$ks_cinder_internal_host = $os_params::ks_cinder_internal_host, $ks_cinder_admin_host = '127.0.0.1',
$ks_cinder_password = $os_params::ks_cinder_password, $ks_cinder_internal_host = '127.0.0.1',
$ks_cinder_public_host = $os_params::ks_cinder_public_host, $ks_cinder_password = 'cinderpassword',
$ks_cinder_public_proto = $os_params::ks_cinder_public_proto, $ks_cinder_public_host = '127.0.0.1',
$ks_cinder_public_port = $os_params::ks_cinder_public_port, $ks_cinder_public_proto = 'http',
$ks_glance_admin_host = $os_params::ks_glance_admin_host, $ks_cinder_public_port = 8776,
$ks_glance_internal_host = $os_params::ks_glance_internal_host, $ks_glance_admin_host = '127.0.0.1',
$ks_glance_password = $os_params::ks_glance_password, $ks_glance_internal_host = '127.0.0.1',
$ks_glance_public_host = $os_params::ks_glance_public_host, $ks_glance_password = 'glancepassword',
$ks_glance_public_proto = $os_params::ks_glance_public_proto, $ks_glance_public_host = '127.0.0.1',
$ks_glance_api_public_port = $os_params::ks_glance_api_public_port, $ks_glance_public_proto = 'http',
$ks_heat_admin_host = $os_params::ks_heat_admin_host, $ks_glance_api_public_port = 9292,
$ks_heat_internal_host = $os_params::ks_heat_internal_host, $ks_heat_admin_host = '127.0.0.1',
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_internal_host = '127.0.0.1',
$ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_password = 'heatpassword',
$ks_heat_public_proto = $os_params::ks_heat_public_proto, $ks_heat_public_host = '127.0.0.1',
$ks_heat_public_port = $os_params::ks_heat_public_port, $ks_heat_public_proto = 'http',
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, $ks_heat_public_port = 8004,
$ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port, $ks_heat_cfn_public_port = 8000,
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = 35357,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_port = 5000,
$ks_keystone_public_host = $os_params::ks_keystone_public_host, $ks_keystone_public_host = '127.0.0.1',
$ks_keystone_public_port = $os_params::ks_keystone_public_port, $ks_keystone_public_port = 5000,
$ks_keystone_public_proto = $os_params::ks_keystone_public_proto, $ks_keystone_public_proto = 'http',
$ks_neutron_admin_host = $os_params::ks_neutron_admin_host, $ks_neutron_admin_host = '127.0.0.1',
$ks_neutron_internal_host = $os_params::ks_neutron_internal_host, $ks_neutron_internal_host = '127.0.0.1',
$ks_neutron_password = $os_params::ks_neutron_password, $ks_neutron_password = 'neutronpassword',
$ks_neutron_public_host = $os_params::ks_neutron_public_host, $ks_neutron_public_host = '127.0.0.1',
$ks_neutron_public_proto = $os_params::ks_neutron_public_proto, $ks_neutron_public_proto = 'http',
$ks_neutron_public_port = $os_params::ks_neutron_public_port, $ks_neutron_public_port = 9696,
$ks_nova_admin_host = $os_params::ks_nova_admin_host, $ks_nova_admin_host = '127.0.0.1',
$ks_nova_internal_host = $os_params::ks_nova_internal_host, $ks_nova_internal_host = '127.0.0.1',
$ks_nova_password = $os_params::ks_nova_password, $ks_nova_password = 'novapassword',
$ks_nova_public_host = $os_params::ks_nova_public_host, $ks_nova_public_host = '127.0.0.1',
$ks_nova_public_proto = $os_params::ks_nova_public_proto, $ks_nova_public_proto = 'http',
$ks_nova_public_port = $os_params::ks_nova_public_port, $ks_nova_public_port = 8774,
$ks_ec2_public_port = $os_params::ks_ec2_public_port, $ks_ec2_public_port = 8773,
$ks_swift_dispersion_password = $os_params::ks_swift_dispersion_password, $ks_swift_dispersion_password = 'dispersion',
$ks_swift_internal_host = $os_params::ks_swift_internal_host, $ks_swift_internal_host = '127.0.0.1',
$ks_swift_admin_host = $os_params::ks_swift_admin_host, $ks_swift_admin_host = '127.0.0.1',
$ks_swift_password = $os_params::ks_swift_password, $ks_swift_password = 'swiftpassword',
$ks_swift_public_host = $os_params::ks_swift_public_host, $ks_swift_public_host = '127.0.0.1',
$ks_swift_public_port = $os_params::ks_swift_public_port, $ks_swift_public_port = 8080,
$ks_swift_public_proto = $os_params::ks_swift_public_proto, $ks_swift_public_proto = 'http',
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$region = $os_params::region, $region = 'RegionOne',
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$log_facility = $os_params::log_facility, $log_facility = 'LOG_LOCAL0',
$use_syslog = $os_params::use_syslog, $use_syslog = true,
$token_driver = 'keystone.token.backends.sql.Token', $ks_token_expiration = 3600,
$ks_token_expiration = $os_params::ks_token_expiration, $token_driver = 'keystone.token.backends.sql.Token'
){ ){
$encoded_user = uriescape($keystone_db_user) $encoded_user = uriescape($keystone_db_user)

61
manifests/image.pp
View File

@@ -21,71 +21,72 @@
# #
# [*glance_db_host*] # [*glance_db_host*]
# (optional) Hostname or IP address to connect to glance database # (optional) Hostname or IP address to connect to glance database
# Default value in params # Defaults to '127.0.0.1'
# #
# [*glance_db_user*] # [*glance_db_user*]
# (optional) Username to connect to glance database # (optional) Username to connect to glance database
# Default value in params # Defaults to 'glance'
# #
# [*glance_db_password*] # [*glance_db_password*]
# (optional) Password to connect to glance database # (optional) Password to connect to glance database
# Default value in params # Defaults to 'glancepassword'
# #
# [*ks_keystone_internal_host*] # [*ks_keystone_internal_host*]
# (optional) Internal Hostname or IP to connect to Keystone API # (optional) Internal Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_glance_api_internal_port*] # [*ks_glance_api_internal_port*]
# (optional) TCP port to connect to Glance API from internal network # (optional) TCP port to connect to Glance API from internal network
# Default value in params # Defaults to '9292'
# #
# [*ks_glance_registry_internal_port*] # [*ks_glance_registry_internal_port*]
# (optional) TCP port to connect to Glance Registry from internal network # (optional) TCP port to connect to Glance Registry from internal network
# Default value in params # Defaults to '9191'
# #
# [*ks_glance_password*] # [*ks_glance_password*]
# (optional) Password used by Glance to connect to Keystone API # (optional) Password used by Glance to connect to Keystone API
# Default value in params # Defaults to 'glancepassword'
# #
# [*rabbit_hosts*] # [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to '127.0.0.1'
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to nova queues. # (optional) Password to connect to nova queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*api_eth*] # [*api_eth*]
# (optional) Which interface we bind the Glance API server. # (optional) Which interface we bind the Glance API server.
# Default value in params # Defaults to '127.0.0.1'
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
class cloud::image( class cloud::image(
$glance_db_host = $os_params::glance_db_host, $glance_db_host = '127.0.0.1',
$glance_db_user = $os_params::glance_db_user, $glance_db_user = 'glance',
$glance_db_password = $os_params::glance_db_password, $glance_db_password = 'glancepassword',
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_glance_internal_host = $os_params::ks_glance_internal_host, $ks_glance_internal_host = '127.0.0.1',
$ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port, $ks_glance_api_internal_port = 9292,
$ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port, $ks_glance_registry_internal_port = 9191,
$ks_glance_password = $os_params::ks_glance_password, $ks_glance_password = 'glancepassword',
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword',
$rabbit_host = $os_params::rabbit_host, $rabbit_host = '127.0.0.1',
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$openstack_vip = $os_params::vip_public_ip, $openstack_vip = undef,
$glance_rbd_pool = $os_params::glance_rbd_pool, $glance_rbd_pool = 'images',
$glance_rbd_user = $os_params::glance_rbd_user, $glance_rbd_user = 'glance',
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$log_facility = $os_params::log_facility, $log_facility = 'LOG_LOCAL0',
$use_syslog = $os_params::use_syslog $use_syslog = true
) { ) {
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled

12
manifests/init.pp
View File

@@ -19,7 +19,7 @@
# #
class cloud( class cloud(
$rhn_registration = $os_params::rhn_registration, $rhn_registration = undef,
) { ) {
if ! ($::osfamily in [ 'RedHat', 'Debian' ]) { if ! ($::osfamily in [ 'RedHat', 'Debian' ]) {
@@ -50,20 +50,20 @@ This node is under the control of Puppet ${::puppetversion}.
# DNS # DNS
class { 'dnsclient': class { 'dnsclient':
nameservers => $os_params::dns_ips, nameservers => ['8.8.8.8'],
options => 'UNSET', options => 'UNSET',
search => $os_params::site_domain, search => 'example.com',
domain => $os_params::site_domain, domain => 'example.com',
} }
# NTP # NTP
class { 'ntp': servers => $::os_params::ntp_servers } class { 'ntp': servers => undef }
# Strong root password for all servers # Strong root password for all servers
user { 'root': user { 'root':
ensure => 'present', ensure => 'present',
gid => '0', gid => '0',
password => $os_params::root_password, password => 'root',
uid => '0', uid => '0',
} }

46
manifests/loadbalancer.pp
View File

@@ -16,7 +16,7 @@
# HAproxy nodes # HAproxy nodes
# #
class cloud::loadbalancer( class cloud::loadbalancer(
$swift_api = $os_params::swift, $swift_api = true,
$ceilometer_api = true, $ceilometer_api = true,
$cinder_api = true, $cinder_api = true,
$glance_api = true, $glance_api = true,
@@ -33,30 +33,30 @@ class cloud::loadbalancer(
$horizon = true, $horizon = true,
$horizon_ssl = false, $horizon_ssl = false,
$spice = true, $spice = true,
$haproxy_auth = $os_params::haproxy_auth, $haproxy_auth = 'admin:changeme',
$keepalived_state = 'BACKUP', $keepalived_state = 'BACKUP',
$keepalived_priority = 50, $keepalived_priority = 50,
$keepalived_interface = $os_params::keepalived_interface, $keepalived_interface = 'eth0',
$keepalived_ipvs = [$os_params::vip_public_ip,$os_params::galera_ip], $keepalived_ipvs = ['127.0.0.1'],
$keepalived_localhost_ip = $os_params::keepalived_localhost_ip, $keepalived_localhost_ip = '127.0.0.1',
$ks_cinder_public_port = $os_params::ks_cinder_public_port, $ks_cinder_public_port = 8776,
$ks_ceilometer_public_port = $os_params::ks_ceilometer_public_port, $ks_ceilometer_public_port = 8777,
$ks_ec2_public_port = $os_params::ks_ec2_public_port, $ks_ec2_public_port = 8773,
$ks_glance_api_public_port = $os_params::ks_glance_api_public_port, $ks_glance_api_public_port = 9292,
$ks_glance_registry_internal_port = $os_params::ks_glance_registry_internal_port, $ks_glance_registry_internal_port = 9191,
$ks_heat_public_port = $os_params::ks_heat_public_port, $ks_heat_public_port = 8004,
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, $ks_heat_cfn_public_port = 8000,
$ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port, $ks_heat_cloudwatch_public_port = 8003,
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = 35357,
$ks_keystone_public_port = $os_params::ks_keystone_public_port, $ks_keystone_public_port = 5000,
$ks_metadata_public_port = $os_params::ks_metadata_public_port, $ks_metadata_public_port = 8775,
$ks_neutron_public_port = $os_params::ks_neutron_public_port, $ks_neutron_public_port = 9696,
$ks_nova_public_port = $os_params::ks_nova_public_port, $ks_nova_public_port = 8774,
$ks_swift_public_port = $os_params::ks_swift_public_port, $ks_swift_public_port = 8080,
$horizon_port = $os_params::horizon_port, $horizon_port = 80,
$spice_port = $os_params::spice_port, $spice_port = 6082,
$vip_public_ip = $os_params::vip_public_ip, $vip_public_ip = '127.0.0.2',
$galera_ip = $os_params::galera_ip $galera_ip = '127.0.0.1'
){ ){
# Ensure Keepalived is started before HAproxy to avoid binding errors. # Ensure Keepalived is started before HAproxy to avoid binding errors.

15
manifests/messaging.pp
View File

@@ -21,11 +21,11 @@
# #
# [*rabbit_names*] # [*rabbit_names*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to $::hostname
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to OpenStack queues. # (optional) Password to connect to OpenStack queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*cluster_node_type*] # [*cluster_node_type*]
# (optionnal) Store the queues on the disc or in the RAM. # (optionnal) Store the queues on the disc or in the RAM.
@@ -33,11 +33,14 @@
# Defaults to 'disc' # Defaults to 'disc'
class cloud::messaging( class cloud::messaging(
$rabbit_names = $os_params::rabbit_names, $cluster_node_type = 'disc',
$rabbit_password = $os_params::rabbit_password, $rabbit_names = $::hostname,
$cluster_node_type = 'disc' $rabbit_password = 'rabbitpassword'
){ ){
# we ensure having an array
$array_rabbit_names = any2array($rabbit_names)
# Packaging issue: https://bugzilla.redhat.com/show_bug.cgi?id=1033305 # Packaging issue: https://bugzilla.redhat.com/show_bug.cgi?id=1033305
if $::osfamily == 'RedHat' { if $::osfamily == 'RedHat' {
file {'/usr/sbin/rabbitmq-plugins': file {'/usr/sbin/rabbitmq-plugins':
@@ -54,7 +57,7 @@ class cloud::messaging(
class { 'rabbitmq': class { 'rabbitmq':
delete_guest_user => true, delete_guest_user => true,
config_cluster => true, config_cluster => true,
cluster_nodes => $rabbit_names, cluster_nodes => $array_rabbit_names,
wipe_db_on_cookie_change => true, wipe_db_on_cookie_change => true,
cluster_node_type => $cluster_node_type cluster_node_type => $cluster_node_type
} }

41
manifests/network.pp
View File

@@ -21,56 +21,57 @@
# #
# [*rabbit_hosts*] # [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to ['127.0.0.1:5672']
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to nova queues. # (optional) Password to connect to nova queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Default value in params # Defaults to true
# #
# [*debug*] # [*debug*]
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # Defaults to true
# #
# [*tunnel_eth*] # [*tunnel_eth*]
# (optional) Which interface we connect to create overlay tunnels. # (optional) Which interface we connect to create overlay tunnels.
# Default value in params # Defaults to '127.0.0.1'
# #
# [*provider_vlan_ranges*] # [*provider_vlan_ranges*]
# (optionnal) VLAN range for provider networks # (optionnal) VLAN range for provider networks
# Default value in params # Defaults to ['physnet1:1000:2999']
# #
# [*provider_bridge_mappings*] # [*provider_bridge_mappings*]
# (optionnal) Bridge mapping for provider networks # (optionnal) Bridge mapping for provider networks
# Default value in params # Defaults to ['physnet1:br-eth1']
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
# [*dhcp_lease_duration*] # [*dhcp_lease_duration*]
# (optionnal) DHCP Lease duration (in seconds) # (optionnal) DHCP Lease duration (in seconds)
# Defauls to '120' # Defauls to '120'
#
class cloud::network( class cloud::network(
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword',
$tunnel_eth = $os_params::tunnel_eth, $tunnel_eth = '127.0.0.1',
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$provider_vlan_ranges = $os_params::provider_vlan_ranges, $provider_vlan_ranges = ['physnet1:1000:2999'],
$provider_bridge_mappings = $os_params::provider_bridge_mappings, $provider_bridge_mappings = ['physnet1:br-eth1'],
$use_syslog = $os_params::use_syslog, $use_syslog = true,
$log_facility = $os_params::log_facility, $log_facility = 'LOG_LOCAL0',
$dhcp_lease_duration = '120', $dhcp_lease_duration = '120'
) { ) {
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled

19
manifests/network/controller.pp
View File

@@ -17,16 +17,15 @@
# #
class cloud::network::controller( class cloud::network::controller(
$neutron_db_host = $os_params::neutron_db_host, $neutron_db_host = '127.0.0.1',
$neutron_db_user = $os_params::neutron_db_user, $neutron_db_user = 'neutron',
$neutron_db_password = $os_params::neutron_db_password, $neutron_db_password = 'neutronpassword',
$ks_neutron_password = $os_params::ks_neutron_password, $ks_neutron_password = 'neutronpassword',
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_public_port = $os_params::ks_keystone_public_port, $ks_keystone_public_port = 5000,
$ks_neutron_public_port = $os_params::ks_neutron_public_port, $ks_neutron_public_port = 9696,
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$ks_admin_tenant = $os_params::ks_admin_tenant, $ks_admin_tenant = 'admin'
$public_cidr = $os_params::public_cidr
) { ) {
include 'cloud::network' include 'cloud::network'

4
manifests/network/dhcp.pp
View File

@@ -17,8 +17,8 @@
# #
class cloud::network::dhcp( class cloud::network::dhcp(
$veth_mtu = $os_params::veth_mtu, $veth_mtu = 1500,
$debug = $os_params::debug $debug = true
) { ) {
include 'cloud::network' include 'cloud::network'

4
manifests/network/l3.pp
View File

@@ -17,8 +17,8 @@
# #
class cloud::network::l3( class cloud::network::l3(
$external_int = $os_params::external_int, $external_int = 'eth0',
$debug = $os_params::debug, $debug = true,
) { ) {
include 'cloud::network' include 'cloud::network'

2
manifests/network/lbaas.pp
View File

@@ -17,7 +17,7 @@
# #
class cloud::network::lbaas( class cloud::network::lbaas(
$debug = $os_params::debug, $debug = true,
$manage_haproxy_pkg = true $manage_haproxy_pkg = true
) { ) {

16
manifests/network/metadata.pp
View File

@@ -19,14 +19,14 @@
class cloud::network::metadata( class cloud::network::metadata(
$enabled = true, $enabled = true,
$debug = $os_params::debug, $debug = true,
$ks_neutron_password = $os_params::ks_neutron_password, $ks_neutron_password = 'neutronpassword',
$neutron_metadata_proxy_shared_secret = $os_params::neutron_metadata_proxy_shared_secret, $neutron_metadata_proxy_shared_secret = 'asecreteaboutneutron',
$nova_metadata_server = $os_params::vip_internal_ip, $nova_metadata_server = '127.0.0.1',
$ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto, $ks_keystone_admin_proto = 'http',
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = 35357,
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = '127.0.0.1',
$auth_region = $os_params::region $auth_region = 'RegionOne',
) { ) {
include 'cloud::network' include 'cloud::network'

5
manifests/object.pp
View File

@@ -20,12 +20,11 @@
# === Parameters: # === Parameters:
# #
# [*swift_hash_suffix*] # [*swift_hash_suffix*]
# (optional) String of text to be used as a salt when hashing to determine mappings in the ring. # (required) String of text to be used as a salt when hashing to determine mappings in the ring.
# Default value in params
# #
class cloud::object( class cloud::object(
$swift_hash_suffix = $os_params::swift_hash_suffix $swift_hash_suffix = undef
) { ) {
class { 'ssh::server::install': } class { 'ssh::server::install': }

22
manifests/object/controller.pp
View File

@@ -17,17 +17,17 @@
# #
class cloud::object::controller( class cloud::object::controller(
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = 35357,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_port = 5000,
$ks_swift_dispersion_password = $os_params::ks_swift_dispersion_password, $ks_swift_dispersion_password = 'dispersion',
$ks_swift_internal_port = $os_params::ks_swift_internal_port, $ks_swift_internal_port = 8080,
$ks_swift_password = $os_params::ks_swift_password, $ks_swift_password = 'swiftpassword',
$statsd_host = $os_params::statsd_host, $statsd_host = '127.0.0.1',
$statsd_port = $os_params::statsd_port, $statsd_port = 4125,
$memcache_servers = $os_params::memcache_servers, $memcache_servers = ['127.0.0.1:11211'],
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
) { ) {
include 'cloud::object' include 'cloud::object'

6
manifests/object/ringbuilder.pp
View File

@@ -17,9 +17,9 @@
# #
class cloud::object::ringbuilder( class cloud::object::ringbuilder(
$rsyncd_ipaddress = $os_params::internal_netif_ip, $rsyncd_ipaddress = '127.0.0.1',
$replicas = $os_params::replicas, $replicas = 3,
$swift_rsync_max_connections = $os_params::swift_rsync_max_connections, $swift_rsync_max_connections = 5,
) { ) {
Ring_object_device <<| |>> Ring_object_device <<| |>>

2
manifests/object/storage.pp
View File

@@ -19,7 +19,7 @@ import 'set_io_scheduler.pp'
# swift storage # swift storage
class cloud::object::storage ( class cloud::object::storage (
$storage_eth = $os_params::storage_eth, $storage_eth = '127.0.0.1',
$swift_zone = undef, $swift_zone = undef,
$object_port = '6000', $object_port = '6000',
$container_port = '6001', $container_port = '6001',

73
manifests/orchestration.pp
View File

@@ -21,95 +21,96 @@
# #
# [*ks_keystone_internal_host*] # [*ks_keystone_internal_host*]
# (optional) Internal Hostname or IP to connect to Keystone API # (optional) Internal Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_admin_host*] # [*ks_keystone_admin_host*]
# (optional) Admin Hostname or IP to connect to Keystone API # (optional) Admin Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_internal_port*] # [*ks_keystone_internal_port*]
# (optional) TCP port to connect to Keystone API from internal network # (optional) TCP port to connect to Keystone API from internal network
# Default value in params # Defaults to '5000'
# #
# [*ks_keystone_admin_port*] # [*ks_keystone_admin_port*]
# (optional) TCP port to connect to Keystone API from admin network # (optional) TCP port to connect to Keystone API from admin network
# Default value in params # Defaults to '35357'
# #
# [*ks_keystone_internal_proto*] # [*ks_keystone_internal_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_keystone_admin_proto*] # [*ks_keystone_admin_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_heat_public_host*] # [*ks_heat_public_host*]
# (optional) Public Hostname or IP to connect to Heat API # (optional) Public Hostname or IP to connect to Heat API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_heat_public_proto*] # [*ks_heat_public_proto*]
# (optional) Protocol used to connect to API. Could be 'http' or 'https'. # (optional) Protocol used to connect to API. Could be 'http' or 'https'.
# Default value in params # Defaults to 'http'
# #
# [*ks_heat_password*] # [*ks_heat_password*]
# (optional) Password used by Heat to connect to Keystone API # (optional) Password used by Heat to connect to Keystone API
# Default value in params # Defaults to 'heatpassword'
# #
# [*heat_db_host*] # [*heat_db_host*]
# (optional) Hostname or IP address to connect to heat database # (optional) Hostname or IP address to connect to heat database
# Default value in params # Defaults to '127.0.0.1'
# #
# [*heat_db_user*] # [*heat_db_user*]
# (optional) Username to connect to heat database # (optional) Username to connect to heat database
# Default value in params # Defaults to 'heat'
# #
# [*heat_db_password*] # [*heat_db_password*]
# (optional) Password to connect to heat database # (optional) Password to connect to heat database
# Default value in params # Defaults to 'heatpassword'
# #
# [*rabbit_hosts*] # [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to ['127.0.0.1:5672']
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to heat queues. # (optional) Password to connect to heat queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Default value in params # Defaults to true
# #
# [*debug*] # [*debug*]
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # Defaults to true
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
class cloud::orchestration( class cloud::orchestration(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_port = '5000',
$ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_keystone_internal_proto = 'http',
$ks_keystone_admin_host = $os_params::ks_keystone_admin_host, $ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_admin_port = $os_params::ks_keystone_admin_port, $ks_keystone_admin_port = '35357',
$ks_keystone_admin_proto = $os_params::ks_keystone_admin_proto, $ks_keystone_admin_proto = 'http',
$ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_public_host = '127.0.0.1',
$ks_heat_public_proto = $os_params::ks_heat_public_proto, $ks_heat_public_proto = 'http',
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_password = 'heatpassword',
$heat_db_host = $os_params::heat_db_host, $heat_db_host = '127.0.0.1',
$heat_db_user = $os_params::heat_db_user, $heat_db_user = 'heat',
$heat_db_password = $os_params::heat_db_password, $heat_db_password = 'heatpassword',
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword',
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$use_syslog = $os_params::use_syslog, $use_syslog = true,
$log_facility = $os_params::log_facility $log_facility = 'LOG_LOCAL0'
) { ) {
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled

8
manifests/orchestration/api.pp
View File

@@ -17,10 +17,10 @@
# #
class cloud::orchestration::api( class cloud::orchestration::api(
$ks_heat_internal_port = $os_params::ks_heat_internal_port, $ks_heat_internal_port = 8004,
$ks_heat_cfn_internal_port = $os_params::ks_heat_cfn_internal_port, $ks_heat_cfn_internal_port = 8000,
$ks_heat_cloudwatch_internal_port = $os_params::ks_heat_cloudwatch_internal_port, $ks_heat_cloudwatch_internal_port = 8003,
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
) { ) {
include 'cloud::orchestration' include 'cloud::orchestration'

12
manifests/orchestration/engine.pp
View File

@@ -19,12 +19,12 @@
class cloud::orchestration::engine( class cloud::orchestration::engine(
$enabled = true, $enabled = true,
$ks_heat_public_host = $os_params::ks_heat_public_host, $ks_heat_public_host = '127.0.0.1',
$ks_heat_public_proto = $os_params::ks_heat_public_proto, $ks_heat_public_proto = 'http',
$ks_heat_password = $os_params::ks_heat_password, $ks_heat_password = 'heatpassword',
$ks_heat_cfn_public_port = $os_params::ks_heat_cfn_public_port, $ks_heat_cfn_public_port = 8000,
$ks_heat_cloudwatch_public_port = $os_params::ks_heat_cloudwatch_public_port, $ks_heat_cloudwatch_public_port = 8003,
$auth_encryption_key = $os_params::heat_auth_encryption_key $auth_encryption_key = 'secrete'
) { ) {
include 'cloud::orchestration' include 'cloud::orchestration'

6
manifests/spof.pp
View File

@@ -21,15 +21,15 @@
# #
# [*cluster_ip*] # [*cluster_ip*]
# (optional) Interface used by Corosync to send multicast traffic # (optional) Interface used by Corosync to send multicast traffic
# Default to params. # Defaults to '127.0.0.1'
# #
# [*multicast_address*] # [*multicast_address*]
# (optionnal) IP address used to send multicast traffic # (optionnal) IP address used to send multicast traffic
# Default to '239.1.1.2'. # Defaults to '239.1.1.2'
# #
class cloud::spof( class cloud::spof(
$cluster_ip = $os_params::cluster_ip, $cluster_ip = '127.0.0.1',
$multicast_address = '239.1.1.2' $multicast_address = '239.1.1.2'
) { ) {

6
manifests/storage/rbd.pp
View File

@@ -15,9 +15,9 @@
# #
class cloud::storage::rbd ( class cloud::storage::rbd (
$fsid = $os_params::ceph_fsid, $fsid = undef,
$cluster_network = $os_params::ceph_cluster_network, $cluster_network = '127.0.0.1/24',
$public_network = $os_params::ceph_public_network $public_network = '127.0.0.1/24'
) { ) {
class { 'ceph::conf': class { 'ceph::conf':

4
manifests/storage/rbd/monitor.pp
View File

@@ -16,8 +16,8 @@
class cloud::storage::rbd::monitor ( class cloud::storage::rbd::monitor (
$id = $::uniqueid, $id = $::uniqueid,
$mon_addr = $os_params::internal_netif_ip, $mon_addr = '127.0.0.1',
$monitor_secret = $os_params::ceph_mon_secret $monitor_secret = 'cephmonsecret'
) { ) {
include 'cloud::storage::rbd' include 'cloud::storage::rbd'

4
manifests/storage/rbd/osd.pp
View File

@@ -14,8 +14,8 @@
# under the License. # under the License.
# #
class cloud::storage::rbd::osd ( class cloud::storage::rbd::osd (
$public_address = $os_params::api_eth, $public_address = '127.0.0.1',
$cluster_address = $os_params::storage_eth, $cluster_address = '127.0.0.1',
$devices = ['sdb','sdc'], $devices = ['sdb','sdc'],
) { ) {

16
manifests/storage/rbd/pools.pp
View File

@@ -15,14 +15,14 @@
# #
class cloud::storage::rbd::pools( class cloud::storage::rbd::pools(
$setup_pools = false, $setup_pools = false,
$glance_rbd_user = $os_params::glance_rbd_user, $glance_rbd_user = 'glance',
$glance_rbd_pool = $os_params::glance_rbd_pool, $glance_rbd_pool = 'images',
$cinder_rbd_user = $os_params::cinder_rbd_user, $cinder_rbd_user = 'cinder',
$cinder_rbd_pool = $os_params::cinder_rbd_pool, $cinder_rbd_pool = 'volumes',
$nova_rbd_pool = $os_params::nova_rbd_pool, $nova_rbd_pool = 'vms',
$cinder_backup_user = $os_params::cinder_rbd_backup_user, $cinder_backup_user = 'cinder',
$cinder_backup_pool = $os_params::cinder_rbd_backup_pool, $cinder_backup_pool = 'cinder_backup',
$ceph_fsid = $os_params::ceph_fsid, $ceph_fsid = undef
) { ) {
if $setup_pools { if $setup_pools {

48
manifests/telemetry.pp
View File

@@ -22,66 +22,66 @@
# #
# [*ceilometer_secret*] # [*ceilometer_secret*]
# Secret key for signing messages. # Secret key for signing messages.
# Default value in params # Defaults to 'ceilometersecret'
# #
# [*rabbit_hosts*] # [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to ['127.0.0.1:5672']
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to nova queues. # (optional) Password to connect to nova queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*ks_keystone_internal_host*] # [*ks_keystone_internal_host*]
# (optional) Internal Hostname or IP to connect to Keystone API # (optional) Internal Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_admin_host*] # [*ks_keystone_admin_host*]
# (optional) Admin Hostname or IP to connect to Keystone API # (optional) Admin Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_keystone_public_host*] # [*ks_keystone_public_host*]
# (optional) Public Hostname or IP to connect to Keystone API # (optional) Public Hostname or IP to connect to Keystone API
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_ceilometer_password*] # [*ks_ceilometer_password*]
# (optional) Password used by Ceilometer to connect to Keystone API # (optional) Password used by Ceilometer to connect to Keystone API
# Default value in params # Defaults to 'ceilometerpassword'
# #
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Default value in params # Defaults to true
# #
# [*debug*] # [*debug*]
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # Defaults to true
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
# [*region*] # [*region*]
# (optional) the keystone region of this node # (optional) the keystone region of this node
# Defaults value in params # Defaults to 'RegionOne'
# #
class cloud::telemetry( class cloud::telemetry(
$ceilometer_secret = $os_params::ceilometer_secret, $ceilometer_secret = 'ceilometersecret',
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword' ,
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = $os_params::ks_keystone_internal_port, $ks_keystone_internal_port = '5000',
$ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_keystone_internal_proto = 'http',
$ks_ceilometer_password = $os_params::ks_ceilometer_password, $ks_ceilometer_password = 'ceilometerpassword',
$region = $os_params::region, $region = 'RegionOne',
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$log_facility = $os_params::log_facility, $log_facility = 'LOG_LOCAL0',
$use_syslog = $os_params::use_syslog, $use_syslog = true,
){ ){
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled

12
manifests/telemetry/server.pp
View File

@@ -17,12 +17,12 @@
# #
class cloud::telemetry::server( class cloud::telemetry::server(
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_proto = $os_params::ks_keystone_internal_proto, $ks_keystone_internal_proto = 'http',
$ks_ceilometer_internal_port = $os_params::ks_ceilometer_internal_port, $ks_ceilometer_internal_port = '5000',
$ks_ceilometer_password = $os_params::ks_ceilometer_password, $ks_ceilometer_password = 'ceilometerpassword',
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$mongo_nodes = $os_params::mongo_nodes, $mongo_nodes = ['127.0.0.1:27017'],
){ ){
include 'cloud::telemetry' include 'cloud::telemetry'

45
manifests/volume.pp
View File

@@ -22,60 +22,61 @@
# #
# [*cinder_db_host*] # [*cinder_db_host*]
# (optional) Cinder database host # (optional) Cinder database host
# Default value in params # Defaults to '127.0.0.1'
# #
# [*cinder_db_user*] # [*cinder_db_user*]
# (optional) Cinder database user # (optional) Cinder database user
# Default value in params # Defaults to 'cinder'
# #
# [*cinder_db_password*] # [*cinder_db_password*]
# (optional) Cinder database password # (optional) Cinder database password
# Default value in params # Defaults to 'cinderpassword'
# #
# [*rabbit_hosts*] # [*rabbit_hosts*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) List of RabbitMQ servers. Should be an array.
# Default value in params # Defaults to ['127.0.0.1:5672']
# #
# [*rabbit_password*] # [*rabbit_password*]
# (optional) Password to connect to cinder queues. # (optional) Password to connect to cinder queues.
# Default value in params # Defaults to 'rabbitpassword'
# #
# [*ks_keystone_internal_host*] # [*ks_keystone_internal_host*]
# (optional) Keystone host (authentication) # (optional) Keystone host (authentication)
# Default value in params # Defaults to '127.0.0.1'
# #
# [*ks_cinder_password*] # [*ks_cinder_password*]
# (optional) Keystone password for cinder user. # (optional) Keystone password for cinder user.
# Default value in params # Defaults to 'cinderpassword'
# #
# [*verbose*] # [*verbose*]
# (optional) Set log output to verbose output # (optional) Set log output to verbose output
# Default value in params # Defaults to true
# #
# [*debug*] # [*debug*]
# (optional) Set log output to debug output # (optional) Set log output to debug output
# Default value in params # Defaults to true
# #
# [*use_syslog*] # [*use_syslog*]
# (optional) Use syslog for logging # (optional) Use syslog for logging
# Defaults value in params # Defaults to true
# #
# [*log_facility*] # [*log_facility*]
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults value in params # Defaults to 'LOG_LOCAL0'
# #
class cloud::volume( class cloud::volume(
$cinder_db_host = $os_params::cinder_db_host, $cinder_db_host = '127.0.0.1',
$cinder_db_user = $os_params::cinder_db_user, $cinder_db_user = 'cinder',
$cinder_db_password = $os_params::cinder_db_password, $cinder_db_password = 'cinderpassword',
$rabbit_hosts = $os_params::rabbit_hosts, $rabbit_hosts = ['127.0.0.1:5672'],
$rabbit_password = $os_params::rabbit_password, $rabbit_password = 'rabbitpassword',
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_cinder_password = $os_params::ks_cinder_password, $ks_cinder_password = 'cinderpassword',
$verbose = $os_params::verbose, $verbose = true,
$debug = $os_params::debug, $debug = true,
$log_facility = $os_params::log_facility, $log_facility = 'LOG_LOCAL0',
$use_syslog = $os_params::use_syslog $use_syslog = true
) { ) {
# Disable twice logging if syslog is enabled # Disable twice logging if syslog is enabled

16
manifests/volume/controller.pp
View File

@@ -17,18 +17,18 @@
# #
class cloud::volume::controller( class cloud::volume::controller(
$ks_cinder_internal_port = $os_params::ks_cinder_internal_port, $ks_cinder_internal_port = 8776,
$ks_cinder_password = $os_params::ks_cinder_password, $ks_cinder_password = 'cinderpassword',
$ks_keystone_internal_host = $os_params::ks_keystone_internal_host, $ks_keystone_internal_host = '127.0.0.1',
$ks_glance_internal_host = $os_params::ks_glance_internal_host, $ks_glance_internal_host = '127.0.0.1',
$ks_glance_api_internal_port = $os_params::ks_glance_api_internal_port, $ks_glance_api_internal_port = 9292,
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
# Maintain backward compatibility for multi-backend # Maintain backward compatibility for multi-backend
$volume_multi_backend = false, $volume_multi_backend = false,
$default_volume_type = undef, $default_volume_type = undef,
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA # TODO(EmilienM) Disabled for now: http://git.io/kfTmcA
# $backup_ceph_pool = $os_params::cinder_rbd_backup_pool, # $backup_ceph_pool = 'backup',
# $backup_ceph_user = $os_params::cinder_rbd_backup_user # $backup_ceph_user = 'cinder'
) { ) {
include 'cloud::volume' include 'cloud::volume'

12
manifests/volume/storage.pp
View File

@@ -55,14 +55,14 @@ class cloud::volume::storage(
$ks_keystone_internal_port = '5000', $ks_keystone_internal_port = '5000',
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_cinder_password = 'secrete', $ks_cinder_password = 'secrete',
# Deprecated parameters $cinder_rbd_pool = 'volumes',
$glance_api_version = '2', $cinder_rbd_user = 'cinder',
$cinder_rbd_pool = $os_params::cinder_rbd_pool, $cinder_rbd_secret_uuid = undef,
$cinder_rbd_user = $os_params::cinder_rbd_user,
$cinder_rbd_secret_uuid = $os_params::ceph_fsid,
$cinder_rbd_conf = '/etc/ceph/ceph.conf', $cinder_rbd_conf = '/etc/ceph/ceph.conf',
$cinder_rbd_flatten_volume_from_snapshot = false, $cinder_rbd_flatten_volume_from_snapshot = false,
$cinder_rbd_max_clone_depth = '5' $cinder_rbd_max_clone_depth = '5',
# Deprecated parameters
$glance_api_version = '2',
) { ) {
include 'cloud::volume' include 'cloud::volume'