openstack
/
fuel-library
Code Issues Proposed changes

Merge "Add posibility to set debug/verbose per service"

This commit is contained in:
Jenkins 2015-09-28 12:30:57 +00:00 committed by Gerrit Code Review
parent f15ad980fa fc4599f14d
commit e55234714c
22 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/osnailyfacter/modular/ceilometer/compute.pp
View File

@ -1,7 +1,5 @@
notice('MODULAR: ceilometer/compute.pp')
$verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0')
@ -27,6 +25,8 @@ $amqp_password = $rabbit_hash['password']
$amqp_user = $rabbit_hash['user']
$ceilometer_user_password = $ceilometer_hash['user_password']
$ceilometer_metering_secret = $ceilometer_hash['metering_secret']
$verbose = pick($ceilometer_hash['verbose'], hiera('verbose', true))
$debug = pick($ceilometer_hash['debug'], hiera('debug', false))
if ($ceilometer_enabled) {
class { 'openstack::ceilometer':

6
deployment/puppet/osnailyfacter/modular/ceilometer/controller.pp
View File

@ -10,8 +10,9 @@ $default_ceilometer_hash = {
'metering_time_to_live' => '604800',
}
$verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$ceilometer_hash = hiera_hash('ceilometer', $default_ceilometer_hash)
$verbose = pick($ceilometer_hash['verbose'], hiera('verbose', true))
$debug = pick($ceilometer_hash['debug'], hiera('debug', false))
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0')
@ -20,7 +21,6 @@ $storage_hash = hiera('storage')
$rabbit_hash = hiera_hash('rabbit_hash')
$management_vip = hiera('management_vip')
$region = hiera('region', 'RegionOne')
$ceilometer_hash = hiera_hash('ceilometer', $default_ceilometer_hash)
$ceilometer_region = pick($ceilometer_hash['region'], $region)
$mongo_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('mongo_roles'))
$mongo_address_map = get_node_to_ipaddr_map_by_network_role($mongo_nodes, 'mongo/db')

6
deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
View File

@ -1,15 +1,15 @@
notice('MODULAR: ceph-osd.pp')
# Pulling hiera
$storage_hash = hiera('storage', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$use_neutron = hiera('use_neutron', false)
$mp_hash = hiera('mp')
$verbose = true
$debug = hiera('debug', true)
$verbose = pick($storage_hash['verbose'], true)
$debug = pick($storage_hash['debug'], hiera('debug', true))
$use_monit = false
$auto_assign_floating_ip = hiera('auto_assign_floating_ip', false)
$storage_hash = hiera('storage', {})
$keystone_hash = hiera('keystone', {})
$access_hash = hiera('access', {})
$network_scheme = hiera_hash('network_scheme')

3
deployment/puppet/osnailyfacter/modular/cluster-haproxy/cluster-haproxy.pp
View File

@ -5,6 +5,7 @@ $management_vip = hiera('management_vip')
$database_vip = hiera('database_vip', '')
$service_endpoint = hiera('service_endpoint', '')
$primary_controller = hiera('primary_controller')
$haproxy_hash = hiera_hash('haproxy', {})
#FIXME(mattymo): Replace with only VIPs for roles assigned to this node
$stats_ipaddresses = delete_undef_values([$management_vip, $database_vip, $service_endpoint, '127.0.0.1'])
@ -13,7 +14,7 @@ class { 'cluster::haproxy':
haproxy_maxconn => '16000',
haproxy_bufsize => '32768',
primary_controller => $primary_controller,
debug => hiera('debug', false),
debug => pick($haproxy_hash['debug'], hiera('debug', false)),
other_networks => direct_networks($network_scheme['endpoints']),
stats_ipaddresses => $stats_ipaddresses
}

7
deployment/puppet/osnailyfacter/modular/glance/glance.pp
View File

@ -4,13 +4,12 @@ $network_scheme = hiera_hash('network_scheme', {})
$network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
$verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$glance_hash = hiera_hash('glance', {})
$verbose = pick($glance_hash['verbose'], hiera('verbose', true))
$debug = pick($glance_hash['debug'], hiera('debug', false))
$management_vip = hiera('management_vip')
$database_vip = hiera('database_vip')
$service_endpoint = hiera('service_endpoint')
$glance_hash = hiera_hash('glance', {})
$storage_hash = hiera('storage')
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)

4
deployment/puppet/osnailyfacter/modular/heat/heat.pp
View File

@ -9,8 +9,8 @@ $max_pool_size = hiera('max_pool_size')
$max_overflow = hiera('max_overflow')
$idle_timeout = hiera('idle_timeout')
$service_endpoint = hiera('service_endpoint')
$debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$debug = pick($heat_hash['debug'], hiera('debug', false))
$verbose = pick($heat_hash['verbose'], hiera('verbose', true))
$use_stderr = hiera('use_stderr', false)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_heat = hiera('syslog_log_facility_heat')

4
deployment/puppet/osnailyfacter/modular/horizon/horizon.pp
View File

@ -38,8 +38,8 @@ class { 'openstack::horizon':
keystone_url => $keystone_url,
use_ssl => hiera('horizon_use_ssl', false),
ssl_no_verify => $ssl_no_verify,
verbose => hiera('verbose', true),
debug => hiera('debug'),
verbose => pick($horizon_hash['verbose'], hiera('verbose', true)),
debug => pick($horizon_hash['debug'], hiera('debug')),
use_syslog => hiera('use_syslog', true),
nova_quota => hiera('nova_quota'),
servername => hiera('public_vip'),

6
deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
View File

@ -6,12 +6,12 @@ prepare_network_config($network_scheme)
$node_name = hiera('node_name')
$verbose = hiera('verbose', true)
$debug = hiera('debug', false)
$keystone_hash = hiera_hash('keystone', {})
$verbose = pick($keystone_hash['verbose'], hiera('verbose', true))
$debug = pick($keystone_hash['debug'], hiera('debug', false))
$use_neutron = hiera('use_neutron', false)
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$keystone_hash = hiera_hash('keystone', {})
$access_hash = hiera_hash('access',{})
$management_vip = hiera('management_vip')
$database_vip = hiera('database_vip')

2
deployment/puppet/osnailyfacter/modular/logging/logging.pp
View File

@ -3,7 +3,7 @@ notice('MODULAR: logging.pp')
$base_syslog_hash = hiera('base_syslog_hash')
$syslog_hash = hiera('syslog_hash')
$use_syslog = hiera('use_syslog', true)
$debug = hiera('debug', false)
$debug = pick($syslog_hash['debug'], hiera('debug', false))
##################################################

4
deployment/puppet/osnailyfacter/modular/murano/murano.pp
View File

@ -15,8 +15,8 @@ $region = hiera('region', 'RegionOne')
$use_neutron = hiera('use_neutron', false)
$service_endpoint = hiera('service_endpoint')
$syslog_log_facility_murano = hiera('syslog_log_facility_murano')
$debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$debug = pick($murano_hash['debug'], hiera('debug', false))
$verbose = pick($murano_hash['verbose'], hiera('verbose', true))
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$rabbit_ha_queues = hiera('rabbit_ha_queues')

4
deployment/puppet/osnailyfacter/modular/openstack-cinder/openstack-cinder.pp
View File

@ -81,8 +81,8 @@ class {'openstack::cinder':
cinder_user_password => $cinder_user_password,
use_syslog => hiera('use_syslog', true),
use_stderr => hiera('use_stderr', false),
verbose => hiera('verbose', true),
debug => hiera('debug', true),
verbose => pick($cinder_hash['verbose'], hiera('verbose', true)),
debug => pick($cinder_hash['debug'], hiera('debug', true)),
syslog_log_facility => hiera('syslog_log_facility_cinder', 'LOG_LOCAL3'),
cinder_rate_limits => hiera('cinder_rate_limits'),
max_retries => $max_retries,

5
deployment/puppet/osnailyfacter/modular/openstack-controller/openstack-controller.pp
View File

@ -44,6 +44,7 @@ $service_workers = pick($nova_hash['workers'],
$memcache_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('memcache_roles'))
$memcache_ipaddrs = ipsort(values(get_node_to_ipaddr_map_by_network_role($memcache_nodes,'mgmt/memcache')))
$roles = node_roles($nodes_hash, hiera('uid'))
$openstack_controller_hash = hiera_hash('openstack_controller', {})
$floating_hash = {}
@ -100,8 +101,8 @@ class { '::openstack::controller':
network_size => hiera('network_size', undef),
network_manager => hiera('network_manager', undef),
network_provider => $network_provider,
verbose => true,
debug => hiera('debug', true),
verbose => pick($openstack_controller_hash['verbose'], true),
debug => pick($openstack_controller_hash['debug'], hiera('debug', true)),
auto_assign_floating_ip => hiera('auto_assign_floating_ip', false),
glance_api_servers => $glance_api_servers,
primary_controller => $primary_controller,

5
deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-compute.pp
View File

@ -12,6 +12,7 @@ $auto_assign_floating_ip = hiera('auto_assign_floating_ip', false)
$rabbit_hash = hiera_hash('rabbit_hash', {})
$neutron_endpoint = hiera('neutron_endpoint', $management_vip)
$region = hiera('region', 'RegionOne')
$openstack_network_hash = hiera_hash('openstack_network', {})
$floating_hash = {}
@ -381,8 +382,8 @@ class { 'openstack::network':
tunnel_types => $tunnel_types,
tenant_network_types => $tenant_network_types,
verbose => true,
debug => hiera('debug', true),
verbose => pick($openstack_network_hash['verbose'], true),
debug => pick($openstack_network_hash['debug'], hiera('debug', true)),
use_syslog => hiera('use_syslog', true),
use_stderr => hiera('use_stderr', false),
syslog_log_facility => hiera('syslog_log_facility_neutron', 'LOG_LOCAL4'),

5
deployment/puppet/osnailyfacter/modular/openstack-network/openstack-network-controller.pp
View File

@ -12,6 +12,7 @@ $network_scheme = hiera('network_scheme', {})
$nova_endpoint = hiera('nova_endpoint', $management_vip)
$neutron_endpoint = hiera('neutron_endpoint', $management_vip)
$region = hiera('region', 'RegionOne')
$openstack_network_hash = hiera_hash('openstack_network', {})
$floating_hash = {}
@ -234,8 +235,8 @@ class { 'openstack::network':
default => $neutron_config['ha_agents'],
undef => $primary_controller ? {true => 'primary', default => 'slave'},
},
verbose => true,
debug => hiera('debug', true),
verbose => pick($openstack_network_hash['verbose'], true),
debug => pick($openstack_network_hash['debug'], hiera('debug', true)),
use_syslog => hiera('use_syslog', true),
use_stderr => hiera('use_stderr', false),
syslog_log_facility => hiera('syslog_log_facility_neutron', 'LOG_LOCAL4'),

2
deployment/puppet/osnailyfacter/modular/rabbitmq/rabbitmq.pp
View File

@ -8,7 +8,6 @@ $queue_provider = hiera('queue_provider', 'rabbitmq')
if $queue_provider == 'rabbitmq' {
$erlang_cookie = hiera('erlang_cookie', 'EOKOWXQREETZSHFNTPEY')
$version = hiera('rabbit_version', '3.3.5')
$debug = hiera('debug', false)
$deployment_mode = hiera('deployment_mode', 'ha_compact')
$amqp_port = hiera('amqp_port', '5673')
$rabbit_hash = hiera_hash('rabbit_hash',
@ -17,6 +16,7 @@ if $queue_provider == 'rabbitmq' {
'password' => false,
}
)
$debug = pick($rabbit_hash['debug'], hiera('debug', false))
$enabled = pick($rabbit_hash['enabled'], true)
$use_pacemaker = pick($rabbit_hash['pacemaker'], true)

6
deployment/puppet/osnailyfacter/modular/roles/cinder.pp
View File

@ -2,14 +2,15 @@ notice('MODULAR: cinder.pp')
# Pulling hiera
prepare_network_config(hiera('network_scheme', {}))
$cinder_hash = hiera_hash('cinder_hash', {})
$storage_address = get_network_role_property('cinder/iscsi', 'ipaddr')
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$primary_controller = hiera('primary_controller')
$use_neutron = hiera('use_neutron', false)
$mp_hash = hiera('mp')
$verbose = true
$debug = hiera('debug', true)
$verbose = pick($cinder_hash['verbose'], true)
$debug = pick($cinder_hash['debug'], hiera('debug', true))
$use_monit = false
$auto_assign_floating_ip = hiera('auto_assign_floating_ip', false)
$nodes_hash = hiera('nodes', {})
@ -20,7 +21,6 @@ $mysql_hash = hiera_hash('mysql_hash', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$glance_hash = hiera_hash('glance_hash', {})
$keystone_hash = hiera_hash('keystone_hash', {})
$cinder_hash = hiera_hash('cinder_hash', {})
$ceilometer_hash = hiera_hash('ceilometer_hash',{})
$access_hash = hiera('access', {})
$network_scheme = hiera_hash('network_scheme')

5
deployment/puppet/osnailyfacter/modular/roles/compute.pp
View File

@ -5,6 +5,7 @@ $network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
# Pulling hiera
$compute_hash = hiera_hash('compute', {})
$node_name = hiera('node_name')
$public_int = hiera('public_int', undef)
$public_vip = hiera('public_vip')
@ -16,8 +17,8 @@ $use_neutron = hiera('use_neutron', false)
$sahara_hash = hiera('sahara', {})
$murano_hash = hiera('murano', {})
$mp_hash = hiera('mp')
$verbose = true
$debug = hiera('debug', true)
$verbose = pick($compute_hash['verbose'], true)
$debug = pick($compute_hash['debug'], hiera('debug', true))
$use_monit = false
$auto_assign_floating_ip = hiera('auto_assign_floating_ip', false)
$nodes_hash = hiera('nodes', {})

3
deployment/puppet/osnailyfacter/modular/roles/mongo.pp
View File

@ -1,11 +1,12 @@
notice('MODULAR: mongo.pp')
prepare_network_config(hiera('network_scheme', {}))
$mongo_hash = hiera_hash('mongo', {})
$mongo_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('mongo_roles'))
$mongo_address_map = get_node_to_ipaddr_map_by_network_role($mongo_nodes, 'mongo/db')
$bind_address = get_network_role_property('mongo/db', 'ipaddr')
$use_syslog = hiera('use_syslog', true)
$debug = hiera('debug', false)
$debug = pick($mongo_hash['debug'], hiera('debug', false))
$ceilometer_hash = hiera_hash('ceilometer_hash')
$roles = hiera('roles')
$replset_name = 'ceilometer'

4
deployment/puppet/osnailyfacter/modular/sahara/sahara.pp
View File

@ -14,8 +14,8 @@ $management_vip = hiera('management_vip')
$use_neutron = hiera('use_neutron', false)
$service_endpoint = hiera('service_endpoint')
$syslog_log_facility_sahara = hiera('syslog_log_facility_sahara')
$debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$debug = pick($sahara_hash['debug'], hiera('debug', false))
$verbose = pick($sahara_hash['verbose'], hiera('verbose', true))
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$rabbit_ha_queues = hiera('rabbit_ha_queues')

4
deployment/puppet/osnailyfacter/modular/swift/swift.pp
View File

@ -18,8 +18,8 @@ $management_vip = hiera('management_vip')
$public_vip = hiera('public_vip')
$swift_api_ipaddr = get_network_role_property('swift/api', 'ipaddr')
$swift_storage_ipaddr = get_network_role_property('swift/replication', 'ipaddr')
$debug = hiera('debug', false)
$verbose = hiera('verbose', false)
$debug = pick($swift_hash['debug'], hiera('debug', false))
$verbose = pick($swift_hash['verbose'], hiera('verbose', false))
$ring_min_part_hours = hiera('swift_ring_min_part_hours', 1)
$deploy_swift_storage = hiera('deploy_swift_storage', true)
$deploy_swift_proxy = hiera('deploy_swift_proxy', true)

10
deployment/puppet/osnailyfacter/modular/vmware/cinder-vmware.pp
View File

@ -1,11 +1,11 @@
notice('MODULAR: cinder-vmware.pp')
$nodes_hash = hiera('nodes', {})
$roles = node_roles($nodes_hash, hiera('uid'))
$nodes_hash = hiera('nodes', {})
$roles = node_roles($nodes_hash, hiera('uid'))
$cinder_hash = hiera_hash('cinder_hash', {})
if (member($roles, 'cinder-vmware')) {
$cinder = hiera_hash('cinder_hash', {})
$debug = hiera('debug', true)
$volumes = get_cinder_vmware_data($cinder['instances'], $debug)
$debug = pick($cinder_hash['debug'], hiera('debug', true))
$volumes = get_cinder_vmware_data($cinder_hash['instances'], $debug)
create_resources(vmware::cinder::vmdk, $volumes)
}

2
deployment/puppet/osnailyfacter/modular/vmware/vcenter.pp
View File

@ -5,7 +5,7 @@ $vcenter_hash = hiera('vcenter_hash')
$public_vip = hiera('public_vip')
$use_neutron = hiera('use_neutron', false)
$ceilometer_hash = hiera('ceilometer',{})
$debug = hiera('debug', false)
$debug = pick($vcenter_hash['debug'], hiera('debug', false))
if $use_vcenter {
class { 'vmware':