Merge pull request #702 from enovance/puppet-strings

(doc) Fix documentation for puppet strings
This commit is contained in:
Emilien Macchi
2014-10-29 17:25:22 -04:00
55 changed files with 4 additions and 56 deletions

View File

@@ -23,7 +23,6 @@
# (optional) IP address on which memcached instance should listen # (optional) IP address on which memcached instance should listen
# Defaults to '127.0.0.1' # Defaults to '127.0.0.1'
# #
class cloud::cache ( class cloud::cache (
$listen_ip = '127.0.0.1', $listen_ip = '127.0.0.1',
){ ){

View File

@@ -72,7 +72,6 @@
# (optionnal) Memcached servers used by Keystone. Should be an array. # (optionnal) Memcached servers used by Keystone. Should be an array.
# Defaults to ['127.0.0.1:11211'] # Defaults to ['127.0.0.1:11211']
# #
class cloud::compute( class cloud::compute(
$nova_db_host = '127.0.0.1', $nova_db_host = '127.0.0.1',
$nova_db_use_slave = false, $nova_db_use_slave = false,

View File

@@ -15,7 +15,6 @@
# #
# Compute API node # Compute API node
# #
class cloud::compute::api( class cloud::compute::api(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_proto = 'http', $ks_keystone_internal_proto = 'http',

View File

@@ -15,7 +15,6 @@
# #
# Compute Certificate node # Compute Certificate node
# #
class cloud::compute::cert { class cloud::compute::cert {
include 'cloud::compute' include 'cloud::compute'

View File

@@ -15,7 +15,6 @@
# #
# Compute Conductor node # Compute Conductor node
# #
class cloud::compute::conductor { class cloud::compute::conductor {
include 'cloud::compute' include 'cloud::compute'

View File

@@ -15,7 +15,6 @@
# #
# Compute Authenfication Console node # Compute Authenfication Console node
# #
class cloud::compute::consoleauth { class cloud::compute::consoleauth {
include 'cloud::compute' include 'cloud::compute'

View File

@@ -15,7 +15,6 @@
# #
# Compute Proxy Console node # Compute Proxy Console node
# #
class cloud::compute::consoleproxy( class cloud::compute::consoleproxy(
$api_eth = '127.0.0.1', $api_eth = '127.0.0.1',
$spice_port = '6082' $spice_port = '6082'

View File

@@ -15,7 +15,6 @@
# #
# Compute controller node # Compute controller node
# #
class cloud::compute::controller( class cloud::compute::controller(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_nova_password = 'novapassword', $ks_nova_password = 'novapassword',

View File

@@ -74,7 +74,7 @@
# (optional) Forward HTTPS proto in the headers # (optional) Forward HTTPS proto in the headers
# Useful when activating SSL binding on HAproxy and not in Horizon. # Useful when activating SSL binding on HAproxy and not in Horizon.
# Defaults to false # Defaults to false
#
class cloud::dashboard( class cloud::dashboard(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$secret_key = 'secrete', $secret_key = 'secrete',

View File

@@ -51,7 +51,6 @@
# (optional) Admin tenant name used to connect to nova. # (optional) Admin tenant name used to connect to nova.
# Defaults to 'admin' # Defaults to 'admin'
# #
class cloud::database::dbaas( class cloud::database::dbaas(
$trove_db_host = '127.0.0.1', $trove_db_host = '127.0.0.1',
$trove_db_user = 'trove', $trove_db_user = 'trove',

View File

@@ -17,7 +17,7 @@
# #
# Class to install API service of OpenStack Database as a Service (Trove) # Class to install API service of OpenStack Database as a Service (Trove)
# #
#
class cloud::database::dbaas::api( class cloud::database::dbaas::api(
$ks_trove_password = 'trovepassword', $ks_trove_password = 'trovepassword',
$verbose = true, $verbose = true,

View File

@@ -17,7 +17,7 @@
# #
# Class to install Conductor service of OpenStack Database as a Service (Trove) # Class to install Conductor service of OpenStack Database as a Service (Trove)
# #
#
class cloud::database::dbaas::conductor( class cloud::database::dbaas::conductor(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = '5000', $ks_keystone_internal_port = '5000',

View File

@@ -17,7 +17,7 @@
# #
# Class to install Taskmanager service of OpenStack Database as a Service (Trove) # Class to install Taskmanager service of OpenStack Database as a Service (Trove)
# #
#
class cloud::database::dbaas::taskmanager( class cloud::database::dbaas::taskmanager(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = '5000', $ks_keystone_internal_port = '5000',

View File

@@ -35,7 +35,6 @@
# If set to false, the setup won't be HA and no replicaset will be created. # If set to false, the setup won't be HA and no replicaset will be created.
# Defaults to hostname # Defaults to hostname
# #
class cloud::database::nosql( class cloud::database::nosql(
$bind_ip = '127.0.0.1', $bind_ip = '127.0.0.1',
$nojournal = false, $nojournal = false,

View File

@@ -68,7 +68,6 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults to 'LOG_LOCAL0' # Defaults to 'LOG_LOCAL0'
# #
class cloud::image( class cloud::image(
$glance_db_host = '127.0.0.1', $glance_db_host = '127.0.0.1',
$glance_db_user = 'glance', $glance_db_user = 'glance',

View File

@@ -55,7 +55,6 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults to 'LOG_LOCAL0' # Defaults to 'LOG_LOCAL0'
# #
class cloud::image::registry( class cloud::image::registry(
$glance_db_host = '127.0.0.1', $glance_db_host = '127.0.0.1',
$glance_db_user = 'glance', $glance_db_user = 'glance',

View File

@@ -17,7 +17,6 @@
# #
# Installs the private cloud system requirements # Installs the private cloud system requirements
# #
class cloud( class cloud(
$rhn_registration = undef, $rhn_registration = undef,
$root_password = 'root', $root_password = 'root',

View File

@@ -17,7 +17,6 @@
# #
# Configure common logging # Configure common logging
# #
class cloud::logging{ class cloud::logging{
include ::fluentd include ::fluentd

View File

@@ -15,7 +15,6 @@
# #
# == Class: cloud::logging::server # == Class: cloud::logging::server
# #
class cloud::logging::server{ class cloud::logging::server{
include ::elasticsearch include ::elasticsearch

View File

@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
class cloud::monitoring::agent::sensu { class cloud::monitoring::agent::sensu {
Package['sensu'] -> Sensu::Plugin <<| |>> Package['sensu'] -> Sensu::Plugin <<| |>>

View File

@@ -91,7 +91,6 @@
# Supported values: 'ml2', 'n1kv'. # Supported values: 'ml2', 'n1kv'.
# Defaults to 'ml2' # Defaults to 'ml2'
# #
class cloud::network( class cloud::network(
$verbose = true, $verbose = true,
$debug = true, $debug = true,

View File

@@ -19,7 +19,6 @@
# (optionnal) Manage or not external network with provider network API # (optionnal) Manage or not external network with provider network API
# Defaults to false. # Defaults to false.
# #
class cloud::network::controller( class cloud::network::controller(
$neutron_db_host = '127.0.0.1', $neutron_db_host = '127.0.0.1',
$neutron_db_user = 'neutron', $neutron_db_user = 'neutron',

View File

@@ -15,7 +15,6 @@
# #
# Network DHCP node # Network DHCP node
# #
class cloud::network::dhcp( class cloud::network::dhcp(
$veth_mtu = 1500, $veth_mtu = 1500,
$debug = true, $debug = true,

View File

@@ -15,7 +15,6 @@
# #
# Network L3 node # Network L3 node
# #
class cloud::network::l3( class cloud::network::l3(
$external_int = 'eth1', $external_int = 'eth1',
$ext_provider_net = false, $ext_provider_net = false,

View File

@@ -15,7 +15,6 @@
# #
# Network LBaaS node # Network LBaaS node
# #
class cloud::network::lbaas( class cloud::network::lbaas(
$debug = true, $debug = true,
$manage_haproxy_pkg = true $manage_haproxy_pkg = true

View File

@@ -16,7 +16,6 @@
# Network Metadata node (need to be run once) # Network Metadata node (need to be run once)
# Could be managed by spof_node manifest # Could be managed by spof_node manifest
# #
class cloud::network::metadata( class cloud::network::metadata(
$enabled = true, $enabled = true,
$debug = true, $debug = true,

View File

@@ -15,7 +15,6 @@
# #
# Network VPNaaS node # Network VPNaaS node
# #
class cloud::network::vpn{ class cloud::network::vpn{
include 'cloud::network' include 'cloud::network'

View File

@@ -22,7 +22,6 @@
# [*swift_hash_suffix*] # [*swift_hash_suffix*]
# (required) 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.
# #
class cloud::object( class cloud::object(
$swift_hash_suffix = undef $swift_hash_suffix = undef
) { ) {

View File

@@ -15,7 +15,6 @@
# #
# Swift Proxy node # Swift Proxy node
# #
class cloud::object::controller( class cloud::object::controller(
$ks_keystone_admin_host = '127.0.0.1', $ks_keystone_admin_host = '127.0.0.1',
$ks_keystone_admin_port = 35357, $ks_keystone_admin_port = 35357,

View File

@@ -15,7 +15,6 @@
# #
# Swift tweaking # Swift tweaking
# #
class cloud::object::tweaking { class cloud::object::tweaking {
file {'/etc/sysctl.d/swift-tuning.conf': file {'/etc/sysctl.d/swift-tuning.conf':
content => " content => "

View File

@@ -91,7 +91,6 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults to 'LOG_LOCAL0' # Defaults to 'LOG_LOCAL0'
# #
class cloud::orchestration( class cloud::orchestration(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_port = '5000', $ks_keystone_internal_port = '5000',

View File

@@ -15,7 +15,6 @@
# #
# Orchestration APIs node # Orchestration APIs node
# #
class cloud::orchestration::api( class cloud::orchestration::api(
$ks_heat_internal_port = 8004, $ks_heat_internal_port = 8004,
$ks_heat_cfn_internal_port = 8000, $ks_heat_cfn_internal_port = 8000,

View File

@@ -16,7 +16,6 @@
# Orchestration engine node (should be run once) # Orchestration engine node (should be run once)
# Could be managed by spof node as Active / Passive. # Could be managed by spof node as Active / Passive.
# #
class cloud::orchestration::engine( class cloud::orchestration::engine(
$enabled = true, $enabled = true,
$ks_heat_public_host = '127.0.0.1', $ks_heat_public_host = '127.0.0.1',

View File

@@ -30,7 +30,6 @@
# (optionnal) IP address used to send multicast traffic # (optionnal) IP address used to send multicast traffic
# Defaults to '239.1.1.2' # Defaults to '239.1.1.2'
# #
class cloud::spof( class cloud::spof(
$cluster_ip = '127.0.0.1', $cluster_ip = '127.0.0.1',
$cluster_members = false, $cluster_members = false,

View File

@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
class cloud::storage::rbd ( class cloud::storage::rbd (
$fsid = undef, $fsid = undef,
$cluster_network = '127.0.0.1/24', $cluster_network = '127.0.0.1/24',

View File

@@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
# #
class cloud::storage::rbd::monitor ( class cloud::storage::rbd::monitor (
$id = $::uniqueid, $id = $::uniqueid,
$mon_addr = '127.0.0.1', $mon_addr = '127.0.0.1',

View File

@@ -68,7 +68,6 @@
# (optional) the keystone region of this node # (optional) the keystone region of this node
# Defaults to 'RegionOne' # Defaults to 'RegionOne'
# #
class cloud::telemetry( class cloud::telemetry(
$ceilometer_secret = 'ceilometersecret', $ceilometer_secret = 'ceilometersecret',
$rabbit_hosts = ['127.0.0.1:5672'], $rabbit_hosts = ['127.0.0.1:5672'],

View File

@@ -15,7 +15,6 @@
# #
# Telemetry Alarm Evaluator nodes # Telemetry Alarm Evaluator nodes
# #
class cloud::telemetry::alarmevaluator( class cloud::telemetry::alarmevaluator(
){ ){

View File

@@ -15,7 +15,6 @@
# #
# Telemetry Alarm Notifier nodes # Telemetry Alarm Notifier nodes
# #
class cloud::telemetry::alarmnotifier( class cloud::telemetry::alarmnotifier(
){ ){

View File

@@ -15,7 +15,6 @@
# #
# Telemetry API nodes # Telemetry API nodes
# #
class cloud::telemetry::api( class cloud::telemetry::api(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_proto = 'http', $ks_keystone_internal_proto = 'http',

View File

@@ -16,7 +16,6 @@
# Telemetry Central Agent node (should be run once) # Telemetry Central Agent node (should be run once)
# Could be managed by spof node as Active / Passive. # Could be managed by spof node as Active / Passive.
# #
class cloud::telemetry::centralagent( class cloud::telemetry::centralagent(
$enabled = true, $enabled = true,
){ ){

View File

@@ -15,7 +15,6 @@
# #
# Telemetry Collector nodes # Telemetry Collector nodes
# #
class cloud::telemetry::collector( class cloud::telemetry::collector(
$mongo_nodes = ['127.0.0.1:27017'], $mongo_nodes = ['127.0.0.1:27017'],
$replicaset_enabled = true, $replicaset_enabled = true,

View File

@@ -15,7 +15,6 @@
# #
# Telemetry Notifications nodes # Telemetry Notifications nodes
# #
class cloud::telemetry::notification { class cloud::telemetry::notification {
include 'cloud::telemetry' include 'cloud::telemetry'

View File

@@ -15,7 +15,6 @@
# #
# Telemetry server nodes # Telemetry server nodes
# #
class cloud::telemetry::server( class cloud::telemetry::server(
$ks_keystone_internal_host = '127.0.0.1', $ks_keystone_internal_host = '127.0.0.1',
$ks_keystone_internal_proto = 'http', $ks_keystone_internal_proto = 'http',

View File

@@ -56,7 +56,6 @@
# (optional) Syslog facility to receive log lines # (optional) Syslog facility to receive log lines
# Defaults to 'LOG_LOCAL0' # Defaults to 'LOG_LOCAL0'
# #
class cloud::volume( class cloud::volume(
$cinder_db_host = '127.0.0.1', $cinder_db_host = '127.0.0.1',
$cinder_db_user = 'cinder', $cinder_db_user = 'cinder',

View File

@@ -15,7 +15,6 @@
# #
# Volume API node # Volume API node
# #
class cloud::volume::api( class cloud::volume::api(
$ks_cinder_internal_port = 8776, $ks_cinder_internal_port = 8776,
$ks_cinder_password = 'cinderpassword', $ks_cinder_password = 'cinderpassword',

View File

@@ -43,7 +43,6 @@
# (optional) Default max number of LUNs in a storage group. # (optional) Default max number of LUNs in a storage group.
# Defaults to: '256' # Defaults to: '256'
# #
define cloud::volume::backend::emc_vnx ( define cloud::volume::backend::emc_vnx (
$iscsi_ip_address, $iscsi_ip_address,
$san_ip, $san_ip,

View File

@@ -25,7 +25,6 @@
# (optional) Cinder volume group name. # (optional) Cinder volume group name.
# Defaults to 'cinder-volumes'. # Defaults to 'cinder-volumes'.
# #
define cloud::volume::backend::iscsi ( define cloud::volume::backend::iscsi (
$iscsi_ip_address, $iscsi_ip_address,
$volume_group = 'cinder-volumes', $volume_group = 'cinder-volumes',

View File

@@ -111,7 +111,6 @@
# (optional) File with the list of available NFS shares # (optional) File with the list of available NFS shares
# Defaults to '' # Defaults to ''
# #
define cloud::volume::backend::netapp ( define cloud::volume::backend::netapp (
$netapp_login, $netapp_login,
$netapp_password, $netapp_password,

View File

@@ -55,7 +55,6 @@
# destination will no longer be valid. # destination will no longer be valid.
# Defaults to 1.0 # Defaults to 1.0
# #
define cloud::volume::backend::nfs( define cloud::volume::backend::nfs(
$volume_backend_name = $name, $volume_backend_name = $name,
$nfs_servers = [], $nfs_servers = [],

View File

@@ -50,7 +50,6 @@
# A value of zero disables cloning # A value of zero disables cloning
# Defaults to '5' # Defaults to '5'
# #
define cloud::volume::backend::rbd ( define cloud::volume::backend::rbd (
$rbd_pool, $rbd_pool,
$rbd_user, $rbd_user,

View File

@@ -15,7 +15,6 @@
# #
# Volume Backup node # Volume Backup node
# #
class cloud::volume::backup( class cloud::volume::backup(
$backup_ceph_pool = 'backup', $backup_ceph_pool = 'backup',
$backup_ceph_user = 'cinder' $backup_ceph_user = 'cinder'

View File

@@ -15,7 +15,6 @@
# #
# Volume controller # Volume controller
# #
class cloud::volume::controller( class cloud::volume::controller(
$ks_cinder_internal_port = 8776, $ks_cinder_internal_port = 8776,
$ks_cinder_password = 'cinderpassword', $ks_cinder_password = 'cinderpassword',

View File

@@ -15,7 +15,6 @@
# #
# Volume Scheduler node # Volume Scheduler node
# #
class cloud::volume::scheduler( class cloud::volume::scheduler(
# Maintain backward compatibility for multi-backend # Maintain backward compatibility for multi-backend
$volume_multi_backend = false $volume_multi_backend = false

View File

@@ -47,8 +47,6 @@
# } # }
# Defaults to undef to maintain backward compatibility. # Defaults to undef to maintain backward compatibility.
# #
class cloud::volume::storage( class cloud::volume::storage(
$cinder_backends = undef, $cinder_backends = undef,
$ks_keystone_internal_proto = 'http', $ks_keystone_internal_proto = 'http',