From 6692602d72ed00172ef5b593a64421d1730301ee Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 22 Apr 2014 19:15:50 +0200 Subject: [PATCH] Defaults values: cleanup manifest documentation Cleanup puppet-doc support. --- manifests/cache.pp | 2 +- manifests/compute.pp | 28 +++--- manifests/dashboard.pp | 16 ++-- manifests/database/nosql.pp | 15 ++-- manifests/database/sql.pp | 4 +- manifests/identity.pp | 160 ++++++++++++++++----------------- manifests/image.pp | 31 +++---- manifests/init.pp | 2 +- manifests/messaging.pp | 13 +-- manifests/network.pp | 19 ++-- manifests/network/metadata.pp | 2 +- manifests/object.pp | 3 +- manifests/orchestration.pp | 37 ++++---- manifests/spof.pp | 4 +- manifests/telemetry.pp | 26 +++--- manifests/volume.pp | 23 ++--- manifests/volume/controller.pp | 4 +- 17 files changed, 195 insertions(+), 194 deletions(-) diff --git a/manifests/cache.pp b/manifests/cache.pp index e4ff37fe..2c500dce 100644 --- a/manifests/cache.pp +++ b/manifests/cache.pp @@ -21,7 +21,7 @@ # # [*listen_ip*] # (optional) IP address on which memcached instance should listen -# Default in params. +# Defaults to '127.0.0.1' # class cloud::cache ( diff --git a/manifests/compute.pp b/manifests/compute.pp index c9b6130b..1a7e63d3 100644 --- a/manifests/compute.pp +++ b/manifests/compute.pp @@ -21,51 +21,51 @@ # # [*nova_db_host*] # (optional) Hostname or IP address to connect to nova database -# Default value in params +# Defaults to '127.0.0.1' # # [*nova_db_user*] # (optional) Username to connect to nova database -# Default value in params +# Defaults to 'nova' # # [*nova_db_password*] # (optional) Password to connect to nova database -# Default value in params +# Defaults to 'novapassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*ks_glance_internal_host*] # (optional) Internal Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*glance_api_port*] # (optional) TCP port to connect to Glance API -# Default value in params +# Defaults to '9292' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*memcache_servers*] # (optionnal) Memcached servers used by Keystone. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:11211'] # class cloud::compute( @@ -83,9 +83,9 @@ class cloud::compute( $neutron_endpoint = '127.0.0.1', $neutron_protocol = 'http', $neutron_password = 'neutronpassword', - $neutron_region_name = 'planet42', + $neutron_region_name = 'RegionOne', $memcache_servers = ['127.0.0.1:11211'], - $availability_zone = 'planet42' + $availability_zone = 'RegionOne' ) { if !defined(Resource['nova_config']) { diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index 28971b07..5d2c901d 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -21,20 +21,20 @@ # # [*ks_keystone_internal_host*] # (optional) Internal address for endpoint. -# Default value in params +# Defaults to '127.0.0.1' # # [*secret_key*] # (optional) Secret key. This is used by Django to provide cryptographic # signing, and should be set to a unique, unpredictable value. -# Default value in params +# Defaults to 'secrete' # # [*horizon_port*] # (optional) Port used to connect to OpenStack Dashboard -# Default value in params +# Defaults to '80' # # [*api_eth*] # (optional) Which interface we bind the Horizon server. -# Default value in params +# Defaults to '127.0.0.1' # # [*servername*] # (optional) DNS name used to connect to Openstack Dashboard. @@ -47,19 +47,19 @@ # # [*keystone_proto*] # (optional) Protocol (http or https) of keystone endpoint. -#  Defaults to params. +#  Defaults to 'http' # # [*keystone_host*] # (optional) IP / Host of keystone endpoint. -#  Defaults to params. +#  Defaults '127.0.0.1' # # [*keystone_port*] # (optional) TCP port of keystone endpoint. -#  Defaults to params. +#  Defaults to '5000' # # [*debug*] # (optional) Enable debug or not. -#  Defaults to params. +#  Defaults to true # # [*listen_ssl*] # (optional) Enable SSL support in Apache. (Defaults to false) diff --git a/manifests/database/nosql.pp b/manifests/database/nosql.pp index 85aedf2a..86e07c1e 100644 --- a/manifests/database/nosql.pp +++ b/manifests/database/nosql.pp @@ -21,7 +21,7 @@ # # [*bind_ip*] # (optional) IP address on which mongod instance should listen -# Defaults in params +# Defaults to '127.0.0.1' # # [*nojournal*] # (optional) Disable mongodb internal cache. This is not recommended for @@ -32,23 +32,24 @@ # [*replset_members*] # (optional) Ceilometer Replica set members hostnames # Should be an array. Example: ['node1', 'node2', node3'] -# Default value in params +# Defaults to hostname # class cloud::database::nosql( $bind_ip = '127.0.0.1', $nojournal = false, - $replset_members = ['mgmt001'] + $replset_members = $::hostname ) { - # bind_ip should be an array - $bind_ip_real = any2array($bind_ip) + # should be an array + $array_bind_ip = any2array($bind_ip) + $array_replset_members = any2array($replset_members) class { 'mongodb::globals': manage_package_repo => true }-> class { 'mongodb': - bind_ip => $bind_ip_real, + bind_ip => $array_bind_ip, nojournal => $nojournal, replset => 'ceilometer', } @@ -62,7 +63,7 @@ class cloud::database::nosql( } mongodb_replset{'ceilometer': - members => $replset_members, + members => $array_replset_members, before => Anchor['mongodb setup done'], } diff --git a/manifests/database/sql.pp b/manifests/database/sql.pp index 0daaaa23..c057e487 100644 --- a/manifests/database/sql.pp +++ b/manifests/database/sql.pp @@ -19,6 +19,9 @@ # # [*galera_internal_ips*] # Array of internal ip of the galera nodes. +# Defaults to ['127.0.0.1'] +# + class cloud::database::sql ( $api_eth = '127.0.0.1', $service_provider = 'sysv', @@ -65,7 +68,6 @@ class cloud::database::sql ( $mysql_service_name = 'mysql' } - # TODO(Gonéri): OS/values detection should be moved in a params.pp case $::osfamily { 'RedHat': { class { 'mysql': diff --git a/manifests/identity.pp b/manifests/identity.pp index 4b2a7a25..20c6773e 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -21,303 +21,294 @@ # # [*identity_roles_addons*] # (optional) Extra keystone roles to create -# Default value in params +# Defaults to ['SwiftOperator', 'ResellerAdmin'] # # [*keystone_db_host*] # (optional) Hostname or IP address to connect to keystone database -# Default value in params +# Defaults to '127.0.0.1' # # [*keystone_db_user*] # (optional) Username to connect to keystone database -# Default value in params +# Defaults to 'keystone' # # [*keystone_db_password*] # (optional) Password to connect to keystone database -# Default value in params +# Defaults to 'keystonepassword' # # [*ks_admin_email*] # (optional) Email address of admin user in Keystone -# Default value in params +# Defaults to 'no-reply@keystone.openstack' # # [*ks_admin_password*] # (optional) Password of admin user in Keystone -# Default value in params +# Defaults to 'adminpassword' # # [*ks_admin_tenant*] # (optional) Admin tenant name in Keystone -# Default value in params +# Defaults to 'admin' # # [*ks_admin_token*] -# (optional) Admin token used by Keystone. -# Default value in params +# (required) Admin token used by Keystone. # # [*ks_glance_internal_host*] # (optional) Internal Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_glance_admin_host*] # (optional) Admin Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_glance_public_host*] # (optional) Public Hostname or IP to connect to Glance API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_internal_host*] # (optional) Internal Hostname or IP to connect to Ceilometer API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_admin_host*] # (optional) Admin Hostname or IP to connect to Ceilometer API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_public_host*] # (optional) Public Hostname or IP to connect to Ceilometer API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_admin_host*] # (optional) Admin Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_public_host*] # (optional) Public Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_nova_internal_host*] # (optional) Internal Hostname or IP to connect to Nova API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_nova_admin_host*] # (optional) Admin Hostname or IP to connect to Nova API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_nova_public_host*] # (optional) Public Hostname or IP to connect to Nova API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_internal_host*] # (optional) Internal Hostname or IP to connect to Cinder API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_admin_host*] # (optional) Admin Hostname or IP to connect to Cinder API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_public_host*] # (optional) Public Hostname or IP to connect to Cinder API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_neutron_internal_host*] # (optional) Internal Hostname or IP to connect to Neutron API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_neutron_admin_host*] # (optional) Admin Hostname or IP to connect to Neutron API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_neutron_public_host*] # (optional) Public Hostname or IP to connect to Neutron API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_internal_host*] # (optional) Internal Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_admin_host*] # (optional) Admin Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_public_host*] # (optional) Public Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_swift_internal_host*] # (optional) Internal Hostname or IP to connect to Swift API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_swift_admin_host*] # (optional) Admin Hostname or IP to connect to Swift API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_swift_public_host*] # (optional) Public Hostname or IP to connect to Swift API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_password*] # (optional) Password used by Ceilometer to connect to Keystone API -# Default value in params +# Defaults to 'ceilometerpassword' # # [*ks_swift_password*] # (optional) Password used by Swift to connect to Keystone API -# Default value in params +# Defaults to 'swiftpassword' # # [*ks_nova_password*] # (optional) Password used by Nova to connect to Keystone API -# Default value in params +# Defaults to 'novapassword' # # [*ks_neutron_password*] # (optional) Password used by Neutron to connect to Keystone API -# Default value in params +# Defaults to 'neutronpassword' # # [*ks_heat_password*] # (optional) Password used by Heat to connect to Keystone API -# Default value in params +# Defaults to 'heatpassword' # # [*ks_glance_password*] # (optional) Password used by Glance to connect to Keystone API -# Default value in params +# Defaults to 'glancepassword' # # [*ks_cinder_password*] # (optional) Password used by Cinder to connect to Keystone API -# Default value in params +# Defaults to 'cinderpassword' # # [*ks_swift_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_ceilometer_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_heat_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_nova_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_neutron_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_glance_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_cinder_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_ceilometer_public_port*] # (optional) TCP port to connect to Ceilometer API from public network -# Default value in params +# Defaults to '8777' # # [*ks_ceilometer_admin_port*] # (optional) TCP port to connect to Ceilometer API from admin network -# Default value in params +# Defaults to '8777' # # [*ks_ceilometer_internal_port*] # (optional) TCP port to connect to Ceilometer API from internal network -# Default value in params +# Defaults to '8777' # # [*ks_keystone_internal_port*] # (optional) TCP port to connect to Keystone API from internal network -# Default value in params +# Defaults to '5000' # # [*ks_keystone_public_port*] # (optional) TCP port to connect to Keystone API from public network -# Default value in params +# Defaults to '5000' # # [*ks_keystone_admin_port*] # (optional) TCP port to connect to Keystone API from admin network -# Default value in params +# Defaults to '35357' # # [*ks_swift_public_port*] # (optional) TCP port to connect to Swift API from public network -# Default value in params +# Defaults to '8080' # # [*ks_nova_internal_port*] # (optional) TCP port to connect to Nova API from internal network -# Default value in params +# Defaults to '8774' # # [*ks_nova_public_port*] # (optional) TCP port to connect to Nova API from public network -# Default value in params +# Defaults to '8774' # # [*ks_ec2_public_port*] # (optional) TCP port to connect to EC2 API from public network -# Default value in params +# Defaults to '8773' # # [*ks_nova_admin_port*] # (optional) TCP port to connect to Nova API from admin network -# Default value in params +# Defaults to '8774' # # [*ks_cinder_internal_port*] # (optional) TCP port to connect to Cinder API from internal network -# Default value in params +# Defaults to '8776' # # [*ks_cinder_public_port*] # (optional) TCP port to connect to Cinder API from public network -# Default value in params +# Defaults to '8776' # # [*ks_cinder_admin_port*] # (optional) TCP port to connect to Cinder API from admin network -# Default value in params +# Defaults to '8776' # # [*ks_neutron_internal_port*] # (optional) TCP port to connect to Neutron API from internal network -# Default value in params +# Defaults to '9696' # # [*ks_neutron_public_port*] # (optional) TCP port to connect to Neutron API from public network -# Default value in params +# Defaults to '9696' # # [*ks_neutron_admin_port*] # (optional) TCP port to connect to Neutron API from admin network -# Default value in params -# -# [*ks_heat_internal_port*] -# (optional) TCP port to connect to Heat API from internal network -# Default value in params +# Defaults to '9696' # # [*ks_heat_public_port*] # (optional) TCP port to connect to Heat API from public network -# Default value in params -# -# [*ks_heat_admin_port*] -# (optional) TCP port to connect to Heat API from admin network -# Default value in params +# Defaults to '8000' # # [*ks_glance_api_internal_port*] # (optional) TCP port to connect to Glance API from internal network -# Default value in params +# Defaults to '9292' # # [*ks_glance_api_public_port*] # (optional) TCP port to connect to Glance API from public network -# Default value in params +# Defaults to '9292' # # [*ks_glance_api_admin_port*] # (optional) TCP port to connect to Glance API from admin network -# Default value in params +# Defaults to '9292' # # [*api_eth*] # (optional) Which interface we bind the Keystone server. -# Default value in params +# Defaults to '127.0.0.1' # # [*region*] # (optional) OpenStack Region Name -# Default value in params +# Defaults to 'RegionOne' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*token_driver*] # (optional) Driver to store tokens @@ -325,8 +316,9 @@ # # [*token_expiration*] # (optional) Amount of time a token should remain valid (in seconds) -# Defaults value in params +# Defaults to '3600' (1 hour) # + class cloud::identity ( $swift_enabled = true, $identity_roles_addons = ['SwiftOperator', 'ResellerAdmin'], @@ -391,7 +383,7 @@ class cloud::identity ( $ks_swift_public_port = 8080, $ks_swift_public_proto = 'http', $api_eth = '127.0.0.1', - $region = 'planet42', + $region = 'RegionOne', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/manifests/image.pp b/manifests/image.pp index ca32af44..a37aa57a 100644 --- a/manifests/image.pp +++ b/manifests/image.pp @@ -21,52 +21,53 @@ # # [*glance_db_host*] # (optional) Hostname or IP address to connect to glance database -# Default value in params +# Defaults to '127.0.0.1' # # [*glance_db_user*] # (optional) Username to connect to glance database -# Default value in params +# Defaults to 'glance' # # [*glance_db_password*] # (optional) Password to connect to glance database -# Default value in params +# Defaults to 'glancepassword' # # [*ks_keystone_internal_host*] # (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*] # (optional) TCP port to connect to Glance API from internal network -# Default value in params +# Defaults to '9292' # # [*ks_glance_registry_internal_port*] # (optional) TCP port to connect to Glance Registry from internal network -# Default value in params +# Defaults to '9191' # # [*ks_glance_password*] # (optional) Password used by Glance to connect to Keystone API -# Default value in params +# Defaults to 'glancepassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to '127.0.0.1' # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*api_eth*] # (optional) Which interface we bind the Glance API server. -# Default value in params +# Defaults to '127.0.0.1' # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # + class cloud::image( $glance_db_host = '127.0.0.1', $glance_db_user = 'glance', @@ -79,9 +80,9 @@ class cloud::image( $rabbit_password = 'rabbitpassword', $rabbit_host = '127.0.0.1', $api_eth = '127.0.0.1', - $openstack_vip = '127.0.0.2', - $glance_rbd_pool = 'images', - $glance_rbd_user = 'glance', + $openstack_vip = undef, + $glance_rbd_pool = 'images', + $glance_rbd_user = 'glance', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/manifests/init.pp b/manifests/init.pp index 908d7ac6..2a7fcd66 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -19,7 +19,7 @@ # class cloud( - $rhn_registration = $os_params::rhn_registration, + $rhn_registration = undef, ) { if ! ($::osfamily in [ 'RedHat', 'Debian' ]) { diff --git a/manifests/messaging.pp b/manifests/messaging.pp index 89d91839..db1a21d9 100644 --- a/manifests/messaging.pp +++ b/manifests/messaging.pp @@ -21,11 +21,11 @@ # # [*rabbit_names*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to $::hostname # # [*rabbit_password*] # (optional) Password to connect to OpenStack queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*cluster_node_type*] # (optionnal) Store the queues on the disc or in the RAM. @@ -34,10 +34,13 @@ class cloud::messaging( $cluster_node_type = 'disc', - $rabbit_names = ['mgmt001'], - $rabbit_password = 'rabbitpassword' + $rabbit_names = $::hostname, + $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 if $::osfamily == 'RedHat' { file {'/usr/sbin/rabbitmq-plugins': @@ -54,7 +57,7 @@ class cloud::messaging( class { 'rabbitmq': delete_guest_user => true, config_cluster => true, - cluster_nodes => $rabbit_names, + cluster_nodes => $array_rabbit_names, wipe_db_on_cookie_change => true, cluster_node_type => $cluster_node_type } diff --git a/manifests/network.pp b/manifests/network.pp index 4e2fd949..f4c5b381 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -21,43 +21,44 @@ # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*tunnel_eth*] # (optional) Which interface we connect to create overlay tunnels. -# Default value in params +# Defaults to '127.0.0.1' # # [*provider_vlan_ranges*] # (optionnal) VLAN range for provider networks -# Default value in params +# Defaults to ['physnet1:1000:2999'] # # [*provider_bridge_mappings*] # (optionnal) Bridge mapping for provider networks -# Default value in params +# Defaults to ['physnet1:br-eth1'] # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*dhcp_lease_duration*] # (optionnal) DHCP Lease duration (in seconds) # Defauls to '120' +# class cloud::network( $verbose = true, diff --git a/manifests/network/metadata.pp b/manifests/network/metadata.pp index 16051e02..4baf5761 100644 --- a/manifests/network/metadata.pp +++ b/manifests/network/metadata.pp @@ -26,7 +26,7 @@ class cloud::network::metadata( $ks_keystone_admin_proto = 'http', $ks_keystone_admin_port = 35357, $ks_keystone_admin_host = '127.0.0.1', - $auth_region = 'planet42', + $auth_region = 'RegionOne', ) { include 'cloud::network' diff --git a/manifests/object.pp b/manifests/object.pp index 00b94409..84dd7e36 100644 --- a/manifests/object.pp +++ b/manifests/object.pp @@ -20,8 +20,7 @@ # === Parameters: # # [*swift_hash_suffix*] -# (optional) String of text to be used as a salt when hashing to determine mappings in the ring. -# Default value in params +# (required) String of text to be used as a salt when hashing to determine mappings in the ring. # class cloud::object( diff --git a/manifests/orchestration.pp b/manifests/orchestration.pp index 140aad5d..7d91cb4f 100644 --- a/manifests/orchestration.pp +++ b/manifests/orchestration.pp @@ -21,76 +21,77 @@ # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_admin_host*] # (optional) Admin Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_internal_port*] # (optional) TCP port to connect to Keystone API from internal network -# Default value in params +# Defaults to '5000' # # [*ks_keystone_admin_port*] # (optional) TCP port to connect to Keystone API from admin network -# Default value in params +# Defaults to '35357' # # [*ks_keystone_internal_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_keystone_admin_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_heat_public_host*] # (optional) Public Hostname or IP to connect to Heat API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_heat_public_proto*] # (optional) Protocol used to connect to API. Could be 'http' or 'https'. -# Default value in params +# Defaults to 'http' # # [*ks_heat_password*] # (optional) Password used by Heat to connect to Keystone API -# Default value in params +# Defaults to 'heatpassword' # # [*heat_db_host*] # (optional) Hostname or IP address to connect to heat database -# Default value in params +# Defaults to '127.0.0.1' # # [*heat_db_user*] # (optional) Username to connect to heat database -# Default value in params +# Defaults to 'heat' # # [*heat_db_password*] # (optional) Password to connect to heat database -# Default value in params +# Defaults to 'heatpassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to heat queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # + class cloud::orchestration( $ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_port = '5000', diff --git a/manifests/spof.pp b/manifests/spof.pp index 333ee5cb..b4102c96 100644 --- a/manifests/spof.pp +++ b/manifests/spof.pp @@ -21,11 +21,11 @@ # # [*cluster_ip*] # (optional) Interface used by Corosync to send multicast traffic -# Default to params. +# Defaults to '127.0.0.1' # # [*multicast_address*] # (optionnal) IP address used to send multicast traffic -# Default to '239.1.1.2'. +# Defaults to '239.1.1.2' # class cloud::spof( diff --git a/manifests/telemetry.pp b/manifests/telemetry.pp index c9356594..65e3faf9 100644 --- a/manifests/telemetry.pp +++ b/manifests/telemetry.pp @@ -22,51 +22,51 @@ # # [*ceilometer_secret*] # Secret key for signing messages. -# Default value in params +# Defaults to 'ceilometersecret' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to nova queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*ks_keystone_internal_host*] # (optional) Internal Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_admin_host*] # (optional) Admin Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_keystone_public_host*] # (optional) Public Hostname or IP to connect to Keystone API -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_ceilometer_password*] # (optional) Password used by Ceilometer to connect to Keystone API -# Default value in params +# Defaults to 'ceilometerpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # # [*region*] # (optional) the keystone region of this node -# Defaults value in params +# Defaults to 'RegionOne' # class cloud::telemetry( @@ -77,7 +77,7 @@ class cloud::telemetry( $ks_keystone_internal_port = '5000', $ks_keystone_internal_proto = 'http', $ks_ceilometer_password = 'ceilometerpassword', - $region = 'planet42', + $region = 'RegionOne', $verbose = true, $debug = true, $log_facility = 'LOG_LOCAL0', diff --git a/manifests/volume.pp b/manifests/volume.pp index 15c65c25..697fb7d3 100644 --- a/manifests/volume.pp +++ b/manifests/volume.pp @@ -22,48 +22,49 @@ # # [*cinder_db_host*] # (optional) Cinder database host -# Default value in params +# Defaults to '127.0.0.1' # # [*cinder_db_user*] # (optional) Cinder database user -# Default value in params +# Defaults to 'cinder' # # [*cinder_db_password*] # (optional) Cinder database password -# Default value in params +# Defaults to 'cinderpassword' # # [*rabbit_hosts*] # (optional) List of RabbitMQ servers. Should be an array. -# Default value in params +# Defaults to ['127.0.0.1:5672'] # # [*rabbit_password*] # (optional) Password to connect to cinder queues. -# Default value in params +# Defaults to 'rabbitpassword' # # [*ks_keystone_internal_host*] # (optional) Keystone host (authentication) -# Default value in params +# Defaults to '127.0.0.1' # # [*ks_cinder_password*] # (optional) Keystone password for cinder user. -# Default value in params +# Defaults to 'cinderpassword' # # [*verbose*] # (optional) Set log output to verbose output -# Default value in params +# Defaults to true # # [*debug*] # (optional) Set log output to debug output -# Default value in params +# Defaults to true # # [*use_syslog*] # (optional) Use syslog for logging -# Defaults value in params +# Defaults to true # # [*log_facility*] # (optional) Syslog facility to receive log lines -# Defaults value in params +# Defaults to 'LOG_LOCAL0' # + class cloud::volume( $cinder_db_host = '127.0.0.1', $cinder_db_user = 'cinder', diff --git a/manifests/volume/controller.pp b/manifests/volume/controller.pp index 0cdb2ec7..eb19ae6d 100644 --- a/manifests/volume/controller.pp +++ b/manifests/volume/controller.pp @@ -27,8 +27,8 @@ class cloud::volume::controller( $volume_multi_backend = false, $default_volume_type = undef, # 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 + # $backup_ceph_pool = 'backup', + # $backup_ceph_user = 'cinder' ) { include 'cloud::volume'