stackforge/puppet-openstack-cloud
Code Issues Proposed changes

default values: rebase after splitting

Browse Source 
set default values for splitted subclasses.

Bug #346
This commit is contained in:
Emilien Macchi
2014-04-24 09:11:11 +02:00
committed by Yanis Guenane
parent 3ea47e873b
commit c4a9fa6282
3 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
manifests/image/api.pp
View File

@@ -21,72 +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_host*]
# (optional) List of RabbitMQ servers. Should be an array. # (optional) IP or Hostname of one RabbitMQ server.
# 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 glance queue.
# 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::api( class cloud::image::api(
$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 = 'rabbit_password',
$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 = '127.0.0.1',
$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

43
manifests/image/registry.pp
View File

@@ -21,55 +21,54 @@
# #
# [*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_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'
# #
# [*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::registry( class cloud::image::registry(
$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_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',
$api_eth = $os_params::api_eth, $api_eth = '127.0.0.1',
$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

5
manifests/volume/backup.pp
View File

@@ -17,9 +17,8 @@
# #
class cloud::volume::backup( class cloud::volume::backup(
# TODO(EmilienM) Disabled for now: http://git.io/kfTmcA $backup_ceph_pool = 'backup',
# $backup_ceph_pool = $os_params::cinder_rbd_backup_pool, $backup_ceph_user = 'cinder'
# $backup_ceph_user = $os_params::cinder_rbd_backup_user
) { ) {
include 'cloud::volume' include 'cloud::volume'