openstack
/
fuel-library
Code Issues Proposed changes

Clean up globals hash keys and all hash lookups 

hiera deep hash lookup fails if one yaml contains 'key_hash'
and the other is just 'key'. This is fixed by writing keys
without the suffix '_hash'.

Added _hash to some variables where it was inconsistent
among top level modules.

Change-Id: I48ec5711a507115d8b7cc167ae881cac4637622f
Closes-Bug: #1542307
This commit is contained in:
Matthew Mosesohn 2016-02-05 19:42:20 +04:00
parent 8e3f672a63
commit 052c982417
94 changed files with 234 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ $rpc_backend = 'rabbit'
$rabbit_ha_queues = hiera('rabbit_ha_queues')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$rabbit_userid = pick($rabbit_hash['user'], 'nova')
$rabbit_password = $rabbit_hash['password']
@ -82,7 +82,7 @@ $internal_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'internal'
$keystone_auth_uri = "${internal_auth_protocol}://${internal_auth_address}:5000/"
$keystone_identity_uri = "${internal_auth_protocol}://${internal_auth_address}:35357/"
$ceilometer_hash = hiera_hash('ceilometer_hash', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$ha_mode = pick($ceilometer_hash['ha_mode'], true)

2
deployment/puppet/osnailyfacter/modular/aodh/db.pp
View File

@ -13,7 +13,7 @@ $db_charset = pick($aodh_hash['db_charset'], 'utf8')
$db_allowed_host = pick($aodh_hash['db_allowed_host'], '127.0.0.1')
$db_allowed_hosts = pick($aodh_hash['db_allowed_hosts'], '%')
$mysql_hash = hiera_hash('mysql_hash', {})
$mysql_hash = hiera_hash('mysql', {})
$mysql_root_user = pick($mysql_hash['root_user'], 'root')
$mysql_root_password = $mysql_hash['root_password']
$db_root_user = pick($aodh_hash['db_root_user'], $mysql_root_user)

2
deployment/puppet/osnailyfacter/modular/astute/dump_rabbitmq_definitions.pp
View File

@ -2,7 +2,7 @@ notice('MODULAR: dump_rabbitmq_definitions.pp')
$definitions_dump_file = '/etc/rabbitmq/definitions'
$original_definitions_dump_file = '/etc/rabbitmq/definitions.full'
$rabbit_hash = hiera_hash('rabbit_hash',
$rabbit_hash = hiera_hash('rabbit',
{
'user' => false,
'password' => false,

4
deployment/puppet/osnailyfacter/modular/astute/service_token_off.pp
View File

@ -4,9 +4,9 @@ notice('MODULAR: service_token_off.pp')
# Used as singular by post-deployment action to disable admin_token
#
$keystone_params = hiera_hash('keystone_hash', {})
$keystone_params_hash = hiera_hash('keystone', {})
if $keystone_params['service_token_off'] {
if $keystone_params_hash['service_token_off'] {
include ::keystone::params
include ::tweaks::apache_wrappers

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

@ -3,7 +3,7 @@ notice('MODULAR: ceilometer/compute.pp')
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0')
$rabbit_hash = hiera_hash('rabbit_hash')
$rabbit_hash = hiera_hash('rabbit')
$management_vip = hiera('management_vip')
$service_endpoint = hiera('service_endpoint', $management_vip)
@ -19,7 +19,7 @@ $default_ceilometer_hash = {
}
$region = hiera('region', 'RegionOne')
$ceilometer_hash = hiera_hash('ceilometer_hash', $default_ceilometer_hash)
$ceilometer_hash = hiera_hash('ceilometer', $default_ceilometer_hash)
$ceilometer_region = pick($ceilometer_hash['region'], $region)
$ceilometer_enabled = $ceilometer_hash['enabled']
$amqp_password = $rabbit_hash['password']

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

@ -19,7 +19,7 @@ $use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_ceilometer', 'LOG_LOCAL0')
$storage_hash = hiera('storage')
$rabbit_hash = hiera_hash('rabbit_hash')
$rabbit_hash = hiera_hash('rabbit')
$management_vip = hiera('management_vip')
$region = hiera('region', 'RegionOne')
$ceilometer_region = pick($ceilometer_hash['region'], $region)

2
deployment/puppet/osnailyfacter/modular/ceilometer/keystone.pp
View File

@ -3,7 +3,7 @@ notice('MODULAR: ceilometer/keystone.pp')
$ceilometer_hash = hiera_hash('ceilometer', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
Class['::osnailyfacter::wait_for_keystone_backends'] -> Class['::ceilometer::keystone::auth']

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

@ -1,7 +1,7 @@
notice('MODULAR: ceph-osd.pp')
# Pulling hiera
$storage_hash = hiera('storage', {})
$storage_hash = hiera_hash('storage', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$service_endpoint = hiera('service_endpoint')
@ -11,11 +11,11 @@ $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)
$keystone_hash = hiera('keystone', {})
$access_hash = hiera('access', {})
$keystone_hash = hiera_hash('keystone', {})
$access_hash = hiera_hash('access', {})
$network_scheme = hiera_hash('network_scheme', {})
$neutron_mellanox = hiera('neutron_mellanox', false)
$syslog_hash = hiera('syslog', {})
$syslog_hash = hiera_hash('syslog', {})
$use_syslog = hiera('use_syslog', true)
$mon_address_map = get_node_to_ipaddr_map_by_network_role(hiera_hash('ceph_monitor_nodes'), 'ceph/public')
$ceph_primary_monitor_node = hiera('ceph_primary_monitor_node')
@ -24,7 +24,7 @@ $primary_mon = $ceph_primary_monitor_node[$primary_mons[0]]['name'
prepare_network_config($network_scheme)
$ceph_cluster_network = get_network_role_property('ceph/replication', 'network')
$ceph_public_network = get_network_role_property('ceph/public', 'network')
$ceph_tuning_settings = hiera('ceph_tuning_settings', {})
$ceph_tuning_settings_hash = hiera_hash('ceph_tuning_settings', {})
$ssl_hash = hiera_hash('use_ssl', {})
$admin_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'protocol', 'http')
$admin_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'hostname', [$service_endpoint, $management_vip])
@ -53,25 +53,25 @@ class {'ceph':
ephemeral_ceph => $storage_hash['ephemeral_ceph'],
}
if $ceph_tuning_settings != {} {
if $ceph_tuning_settings_hash != {} {
ceph_conf {
'global/debug_default' : value => $debug;
'global/max_open_files' : value => $ceph_tuning_settings['max_open_files'];
'osd/osd_mkfs_type' : value => $ceph_tuning_settings['osd_mkfs_type'];
'osd/osd_mount_options_xfs' : value => $ceph_tuning_settings['osd_mount_options_xfs'];
'osd/osd_op_threads' : value => $ceph_tuning_settings['osd_op_threads'];
'osd/filestore_queue_max_ops' : value => $ceph_tuning_settings['filestore_queue_max_ops'];
'osd/filestore_queue_committing_max_ops' : value => $ceph_tuning_settings['filestore_queue_committing_max_ops'];
'osd/journal_max_write_entries' : value => $ceph_tuning_settings['journal_max_write_entries'];
'osd/journal_queue_max_ops' : value => $ceph_tuning_settings['journal_queue_max_ops'];
'osd/objecter_inflight_ops' : value => $ceph_tuning_settings['objecter_inflight_ops'];
'osd/filestore_queue_max_bytes' : value => $ceph_tuning_settings['filestore_queue_max_bytes'];
'osd/filestore_queue_committing_max_bytes': value => $ceph_tuning_settings['filestore_queue_committing_max_bytes'];
'osd/journal_max_write_bytes' : value => $ceph_tuning_settings['journal_queue_max_bytes'];
'osd/journal_queue_max_bytes' : value => $ceph_tuning_settings['journal_queue_max_bytes'];
'osd/ms_dispatch_throttle_bytes' : value => $ceph_tuning_settings['ms_dispatch_throttle_bytes'];
'osd/objecter_infilght_op_bytes' : value => $ceph_tuning_settings['objecter_infilght_op_bytes'];
'osd/filestore_max_sync_interval' : value => $ceph_tuning_settings['filestore_max_sync_interval'];
'global/max_open_files' : value => $ceph_tuning_settings_hash['max_open_files'];
'osd/osd_mkfs_type' : value => $ceph_tuning_settings_hash['osd_mkfs_type'];
'osd/osd_mount_options_xfs' : value => $ceph_tuning_settings_hash['osd_mount_options_xfs'];
'osd/osd_op_threads' : value => $ceph_tuning_settings_hash['osd_op_threads'];
'osd/filestore_queue_max_ops' : value => $ceph_tuning_settings_hash['filestore_queue_max_ops'];
'osd/filestore_queue_committing_max_ops' : value => $ceph_tuning_settings_hash['filestore_queue_committing_max_ops'];
'osd/journal_max_write_entries' : value => $ceph_tuning_settings_hash['journal_max_write_entries'];
'osd/journal_queue_max_ops' : value => $ceph_tuning_settings_hash['journal_queue_max_ops'];
'osd/objecter_inflight_ops' : value => $ceph_tuning_settings_hash['objecter_inflight_ops'];
'osd/filestore_queue_max_bytes' : value => $ceph_tuning_settings_hash['filestore_queue_max_bytes'];
'osd/filestore_queue_committing_max_bytes': value => $ceph_tuning_settings_hash['filestore_queue_committing_max_bytes'];
'osd/journal_max_write_bytes' : value => $ceph_tuning_settings_hash['journal_queue_max_bytes'];
'osd/journal_queue_max_bytes' : value => $ceph_tuning_settings_hash['journal_queue_max_bytes'];
'osd/ms_dispatch_throttle_bytes' : value => $ceph_tuning_settings_hash['ms_dispatch_throttle_bytes'];
'osd/objecter_infilght_op_bytes' : value => $ceph_tuning_settings_hash['objecter_infilght_op_bytes'];
'osd/filestore_max_sync_interval' : value => $ceph_tuning_settings_hash['filestore_max_sync_interval'];
}
# File /root/ceph.conf is symlink which is created after /etc/ceph/ceph.conf in ceph::conf class
File<| title == '/root/ceph.conf' |> -> Ceph_conf <||>

4
deployment/puppet/osnailyfacter/modular/ceph/ceph_compute.pp
View File

@ -1,13 +1,13 @@
notice('MODULAR: ceph/ceph_compute.pp')
$mon_address_map = get_node_to_ipaddr_map_by_network_role(hiera_hash('ceph_monitor_nodes'), 'ceph/public')
$storage_hash = hiera_hash('storage_hash', {})
$storage_hash = hiera_hash('storage', {})
$use_neutron = hiera('use_neutron')
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ceph = hiera('syslog_log_facility_ceph','LOG_LOCAL0')
$keystone_hash = hiera_hash('keystone_hash', {})
$keystone_hash = hiera_hash('keystone', {})
# Cinder settings
$cinder_pool = 'volumes'
# Glance settings

2
deployment/puppet/osnailyfacter/modular/ceph/ceph_pools.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: ceph/ceph_pools')
$storage_hash = hiera('storage', {})
$storage_hash = hiera_hash('storage', {})
$osd_pool_default_pg_num = $storage_hash['pg_num']
$osd_pool_default_pgp_num = $storage_hash['pg_num']
# Cinder settings

6
deployment/puppet/osnailyfacter/modular/ceph/mon.pp
View File

@ -1,12 +1,12 @@
notice('MODULAR: ceph/mon.pp')
$storage_hash = hiera('storage', {})
$storage_hash = hiera_hash('storage', {})
$use_neutron = hiera('use_neutron')
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ceph = hiera('syslog_log_facility_ceph','LOG_LOCAL0')
$keystone_hash = hiera('keystone', {})
$keystone_hash = hiera_hash('keystone', {})
$mon_address_map = get_node_to_ipaddr_map_by_network_role(hiera_hash('ceph_monitor_nodes'), 'ceph/public')
if ($storage_hash['images_ceph']) {
@ -32,7 +32,7 @@ if $use_ceph {
$primary_mons = keys($ceph_primary_monitor_node)
$primary_mon = $ceph_primary_monitor_node[$primary_mons[0]]['name']
prepare_network_config(hiera_hash('network_scheme',{}))
prepare_network_config(hiera_hash('network_scheme', {}))
$ceph_cluster_network = get_network_role_property('ceph/replication', 'network')
$ceph_public_network = get_network_role_property('ceph/public', 'network')
$mon_addr = get_network_role_property('ceph/public', 'ipaddr')

6
deployment/puppet/osnailyfacter/modular/ceph/radosgw.pp
View File

@ -1,12 +1,12 @@
notice('MODULAR: ceph/radosgw.pp')
$storage_hash = hiera('storage', {})
$storage_hash = hiera_hash('storage', {})
$use_neutron = hiera('use_neutron')
$public_vip = hiera('public_vip')
$keystone_hash = hiera('keystone', {})
$keystone_hash = hiera_hash('keystone', {})
$management_vip = hiera('management_vip')
$service_endpoint = hiera('service_endpoint')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$radosgw_large_pool_name = ".rgw"
$mon_address_map = get_node_to_ipaddr_map_by_network_role(hiera_hash('ceph_monitor_nodes'), 'ceph/public')
$external_lb = hiera('external_lb', false)

2
deployment/puppet/osnailyfacter/modular/ceph/updatedb.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: ceph/updatedb.pp')
$storage_hash = hiera('storage', {})
$storage_hash = hiera_hash('storage', {})
if ($storage_hash['volumes_ceph'] or
$storage_hash['images_ceph'] or

4
deployment/puppet/osnailyfacter/modular/fuel_pkgs/setup_repositories.pp
View File

@ -1,7 +1,7 @@
notice('MODULAR: setup_repositories.pp')
$repo_setup = hiera('repo_setup', {})
$repos = $repo_setup['repos']
$repo_setup_hash = hiera_hash('repo_setup', {})
$repos = $repo_setup_hash['repos']
if $::osfamily == 'Debian' {

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

@ -14,10 +14,10 @@ $storage_hash = hiera('storage')
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility = hiera('syslog_log_facility_glance')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$max_pool_size = hiera('max_pool_size')
$max_overflow = hiera('max_overflow')
$ceilometer_hash = hiera_hash('ceilometer_hash', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$region = hiera('region','RegionOne')
$workers_max = hiera('workers_max', 16)
$service_workers = pick($glance_hash['glance_workers'],
@ -78,7 +78,7 @@ $admin_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', '
$admin_auth_address = get_ssl_property($ssl_hash, {}, 'keystone', 'admin', 'hostname', [hiera('service_endpoint', ''), $management_vip])
$glance_endpoint = get_ssl_property($ssl_hash, {}, 'glance', 'internal', 'hostname', [$management_vip])
$murano_hash = hiera_hash('murano_hash', {})
$murano_hash = hiera_hash('murano', {})
$murano_plugins = pick($murano_hash['plugins'], {})
$auth_uri = "${internal_auth_protocol}://${internal_auth_address}:5000/"

2
deployment/puppet/osnailyfacter/modular/glance/keystone.pp
View File

@ -2,7 +2,7 @@ notice('MODULAR: glance/keystone.pp')
$glance_hash = hiera_hash('glance', {})
$public_vip = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$management_vip = hiera('management_vip')
$region = pick($glance_hash['region'], hiera('region', 'RegionOne'))
$password = $glance_hash['user_password']

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

@ -3,14 +3,14 @@ notice('MODULAR: heat.pp')
prepare_network_config(hiera_hash('network_scheme', {}))
$management_vip = hiera('management_vip')
$heat_hash = hiera_hash('heat', {})
$sahara_hash = hiera_hash('sahara_hash', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$sahara_hash = hiera_hash('sahara', {})
$rabbit_hash = hiera_hash('rabbit', {})
$max_retries = hiera('max_retries')
$max_pool_size = hiera('max_pool_size')
$max_overflow = hiera('max_overflow')
$idle_timeout = hiera('idle_timeout')
$service_endpoint = hiera('service_endpoint')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_vip = hiera('public_vip')
$primary_controller = hiera('primary_controller')

2
deployment/puppet/osnailyfacter/modular/heat/keystone.pp
View File

@ -4,7 +4,7 @@ $heat_hash = hiera_hash('heat', {})
$public_vip = hiera('public_vip')
$region = pick($heat_hash['region'], hiera('region', 'RegionOne'))
$management_vip = hiera('management_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'heat', 'public', 'protocol', 'http')

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

@ -5,10 +5,10 @@ $horizon_hash = hiera_hash('horizon', {})
$service_endpoint = hiera('service_endpoint')
$memcached_server = hiera('memcached_addresses')
$bind_address = get_network_role_property('horizon', 'ipaddr')
$storage_hash = hiera_hash('storage_hash', {})
$storage_hash = hiera_hash('storage', {})
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', {})
$public_ssl = hiera('public_ssl')
$ssl_no_verify = $public_ssl['horizon']
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_no_verify = $public_ssl_hash['horizon']
$overview_days_range = pick($horizon_hash['overview_days_range'], 1)
$external_lb = hiera('external_lb', false)

2
deployment/puppet/osnailyfacter/modular/ironic/ironic-compute.pp
View File

@ -20,7 +20,7 @@ $use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_LOCAL0')
$syslog_log_facility_nova = hiera('syslog_log_facility_nova', 'LOG_LOCAL6')
$amqp_hosts = hiera('amqp_hosts')
$rabbit_hash = hiera_hash('rabbit_hash')
$rabbit_hash = hiera_hash('rabbit')
$nova_report_interval = hiera('nova_report_interval')
$nova_service_down_time = hiera('nova_service_down_time')
$neutron_config = hiera_hash('quantum_settings')

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

@ -16,7 +16,7 @@ $verbose = hiera('verbose', true)
$default_log_levels = hiera_hash('default_log_levels')
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_USER')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$amqp_hosts = hiera('amqp_hosts')
$amqp_port = hiera('amqp_port', '5673')
$rabbit_hosts = split($amqp_hosts, ',')

2
deployment/puppet/osnailyfacter/modular/ironic/keystone.pp
View File

@ -3,7 +3,7 @@ notice('MODULAR: ironic/keystone.pp')
$ironic_hash = hiera_hash('ironic', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ironic_tenant = pick($ironic_hash['tenant'],'services')
$ironic_user = pick($ironic_hash['auth_name'],'ironic')
$ironic_user_password = pick($ironic_hash['user_password'],'ironic')

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

@ -16,7 +16,7 @@ $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)
$access_hash = hiera_hash('access',{})
$access_hash = hiera_hash('access', {})
$management_vip = hiera('management_vip')
$database_vip = hiera('database_vip')
$public_vip = hiera('public_vip')
@ -24,9 +24,9 @@ $service_endpoint = hiera('service_endpoint')
$glance_hash = hiera_hash('glance', {})
$nova_hash = hiera_hash('nova', {})
$cinder_hash = hiera_hash('cinder', {})
$ceilometer_hash = hiera_hash('ceilometer_hash', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$syslog_log_facility = hiera('syslog_log_facility_keystone')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$neutron_user_password = hiera('neutron_user_password', false)
$workers_max = hiera('workers_max', 16)
$service_workers = pick($keystone_hash['workers'],
@ -62,7 +62,7 @@ $admin_user = $access_hash['user']
$admin_password = $access_hash['password']
$region = hiera('region', 'RegionOne')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_cert = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'public', 'path', [''])
@ -112,14 +112,14 @@ $max_overflow = hiera('max_overflow')
$max_retries = '-1'
$database_idle_timeout = '3600'
$murano_settings_hash = hiera('murano_settings', {})
$murano_settings_hash = hiera_hash('murano_settings', {})
if has_key($murano_settings_hash, 'murano_repo_url') {
$murano_repo_url = $murano_settings_hash['murano_repo_url']
} else {
$murano_repo_url = 'http://storage.apps.openstack.org'
}
$murano_hash = hiera_hash('murano_hash', {})
$murano_hash = hiera_hash('murano', {})
$murano_plugins = pick($murano_hash['plugins'], {})
if has_key($murano_plugins, 'glance_artifacts_plugin') {
$murano_glare_plugin = $murano_plugins['glance_artifacts_plugin']['enabled']

2
deployment/puppet/osnailyfacter/modular/keystone/workloads_collector_add.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: keystone/workloads_collector_add.pp')
$workloads_hash = hiera('workloads_collector', {})
$workloads_hash = hiera_hash('workloads_collector', {})
$external_lb = hiera('external_lb', false)
$ssl_hash = hiera_hash('use_ssl', {})
$management_vip = hiera('management_vip')

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

@ -1,7 +1,7 @@
notice('MODULAR: logging.pp')
$base_syslog_hash = hiera('base_syslog_hash')
$syslog_hash = hiera('syslog_hash')
$base_syslog_hash = hiera('base_syslog')
$syslog_hash = hiera('syslog')
$use_syslog = hiera('use_syslog', true)
$debug = pick($syslog_hash['debug'], hiera('debug', false))
$rabbit_fqdn_prefix = hiera('node_name_prefix_for_messaging', 'messaging-')

2
deployment/puppet/osnailyfacter/modular/murano/cfapi.pp
View File

@ -2,7 +2,7 @@ notice('MODULAR: murano/cfapi.pp')
prepare_network_config(hiera_hash('network_scheme', {}))
$access_hash = hiera_hash('access_hash', {})
$access_hash = hiera_hash('access', {})
$murano_cfapi_hash = hiera_hash('murano-cfapi', {})
$public_ip = hiera('public_vip')
$management_ip = hiera('management_vip')

2
deployment/puppet/osnailyfacter/modular/murano/db.pp
View File

@ -1,7 +1,7 @@
notice('MODULAR: murano/db.pp')
$node_name = hiera('node_name')
$murano_hash = hiera_hash('murano_hash', {})
$murano_hash = hiera_hash('murano', {})
$murano_enabled = pick($murano_hash['enabled'], false)
$mysql_hash = hiera_hash('mysql', {})
$management_vip = hiera('management_vip', undef)

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

@ -1,10 +1,10 @@
notice('MODULAR: murano/keystone.pp')
$murano_hash = hiera_hash('murano_hash', {})
$murano_hash = hiera_hash('murano', {})
$public_ip = hiera('public_vip')
$management_ip = hiera('management_vip')
$region = hiera('region', 'RegionOne')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
Class['::osnailyfacter::wait_for_keystone_backends'] -> Class['murano::keystone::auth']

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

@ -1,10 +1,10 @@
notice('MODULAR: murano/keystone.pp')
$murano_hash = hiera_hash('murano_hash', {})
$murano_hash = hiera_hash('murano', {})
$public_ip = hiera('public_vip')
$management_ip = hiera('management_vip')
$region = hiera('region', 'RegionOne')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
Class['::osnailyfacter::wait_for_keystone_backends'] -> Class['murano::keystone::cfapi_auth']

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

@ -2,9 +2,9 @@ notice('MODULAR: murano.pp')
prepare_network_config(hiera_hash('network_scheme', {}))
$murano_hash = hiera_hash('murano_hash', {})
$murano_hash = hiera_hash('murano', {})
$murano_settings_hash = hiera_hash('murano_settings', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$neutron_config = hiera_hash('neutron_config', {})
$public_ip = hiera('public_vip')
$database_ip = hiera('database_vip')

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

@ -1,7 +1,7 @@
notice('MODULAR: murano/rabbitmq.pp')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$murano_hash = hiera_hash('murano_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$murano_hash = hiera_hash('murano', {})
if $rabbit_hash == {} {
fail('No rabbit_hash defined')

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

@ -23,12 +23,12 @@ define create_cinder_types (
}
}
$access_admin = hiera_hash('access_hash', {})
$access_hash = hiera_hash('access', {})
$public_vip = hiera('public_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$region = hiera('region', 'RegionOne')
$storage_hash = hiera_hash('storage_hash', {})
$storage_hash = hiera_hash('storage', {})
$backends = $storage_hash['volume_backend_names']
$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'keystone', 'public', 'protocol', 'http')
@ -38,9 +38,9 @@ $backend_names = keys($available_backends)
create_cinder_types { $backend_names:
volume_backend_names => $available_backends,
os_password => $access_admin['password'],
os_tenant_name => $access_admin['tenant'],
os_username => $access_admin['user'],
os_password => $access_hash['password'],
os_tenant_name => $access_hash['tenant'],
os_username => $access_hash['user'],
os_auth_url => "${public_protocol}://${public_address}:5000/v2.0/",
os_region_name => $region,
}

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

@ -1,7 +1,7 @@
notice('MODULAR: cinder/keystone.pp')
$cinder_hash = hiera_hash('cinder', {})
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')

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

@ -2,14 +2,14 @@ notice('MODULAR: openstack-cinder.pp')
#Network stuff
prepare_network_config(hiera_hash('network_scheme', {}))
$cinder_hash = hiera_hash('cinder_hash', {})
$cinder_hash = hiera_hash('cinder', {})
$management_vip = hiera('management_vip')
$queue_provider = hiera('queue_provider', 'rabbitmq')
$cinder_volume_group = hiera('cinder_volume_group', 'cinder')
$storage_hash = hiera_hash('storage_hash', {})
$ceilometer_hash = hiera_hash('ceilometer_hash',{})
$sahara_hash = hiera_hash('sahara_hash',{})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$storage_hash = hiera_hash('storage', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$sahara_hash = hiera_hash('sahara', {})
$rabbit_hash = hiera_hash('rabbit', {})
$service_endpoint = hiera('service_endpoint')
$workers_max = hiera('workers_max', 16)
$service_workers = pick($cinder_hash['workers'], min(max($::processorcount, 2), $workers_max))

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

@ -3,7 +3,7 @@ notice('MODULAR: openstack-controller/keystone.pp')
$nova_hash = hiera_hash('nova', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'nova', 'public', 'protocol', 'http')

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

@ -29,7 +29,7 @@ $storage_hash = hiera_hash('storage', {})
$nova_hash = hiera_hash('nova', {})
$nova_config_hash = hiera_hash('nova_config', {})
$api_bind_address = get_network_role_property('nova/api', 'ipaddr')
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$service_endpoint = hiera('service_endpoint')
$ssl_hash = hiera_hash('use_ssl', {})
$sahara_enabled = pick($sahara_hash['enabled'], false)

2
deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-ceilometer.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: openstack-haproxy-ceilometer.pp')
$ceilometer_hash = hiera_hash('ceilometer',{})
$ceilometer_hash = hiera_hash('ceilometer', {})
# NOT enabled by default
$use_ceilometer = pick($ceilometer_hash['enabled'], false)
$public_ssl_hash = hiera_hash('public_ssl', {})

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

@ -1,6 +1,6 @@
notice('MODULAR: openstack-haproxy-cinder.pp')
$cinder_hash = hiera_hash('cinder_hash', {})
$cinder_hash = hiera_hash('cinder', {})
# enabled by default
$use_cinder = pick($cinder_hash['enabled'], true)
$public_ssl_hash = hiera_hash('public_ssl', {})

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

@ -1,7 +1,7 @@
notice('MODULAR: openstack-haproxy-murano.pp')
$murano_hash = hiera_hash('murano_hash',{})
$murano_cfapi_hash = hiera_hash('murano-cfapi',{})
$murano_hash = hiera_hash('murano', {})
$murano_cfapi_hash = hiera_hash('murano-cfapi', {})
# NOT enabled by default
$use_murano = pick($murano_hash['enabled'], false)
$use_murano_cfapi = pick($murano_cfapi_hash['enabled'], false)

2
deployment/puppet/osnailyfacter/modular/openstack-haproxy/openstack-haproxy-sahara.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: openstack-haproxy-sahara.pp')
$sahara_hash = hiera_hash('sahara_hash',{})
$sahara_hash = hiera_hash('sahara', {})
# NOT enabled by default
$use_sahara = pick($sahara_hash['enabled'], false)
$public_ssl_hash = hiera_hash('public_ssl', {})

2
deployment/puppet/osnailyfacter/modular/openstack-network/common-config.pp
View File

@ -21,7 +21,7 @@ if $use_neutron {
$service_plugins = $default_service_plugins
}
$rabbit_hash = hiera_hash('rabbit_hash', {})
$rabbit_hash = hiera_hash('rabbit', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$network_scheme = hiera_hash('network_scheme', {})

2
deployment/puppet/osnailyfacter/modular/openstack-network/keystone.pp
View File

@ -4,7 +4,7 @@ $use_neutron = hiera('use_neutron', false)
$neutron_hash = hiera_hash('quantum_settings', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'neutron', 'public', 'protocol', 'http')

2
deployment/puppet/osnailyfacter/modular/openstack-network/networks.pp
View File

@ -1,7 +1,7 @@
notice('MODULAR: openstack-network/networks.pp')
if hiera('use_neutron', false) {
$access_hash = hiera('access', { })
$access_hash = hiera_hash('access', {})
$keystone_admin_tenant = $access_hash['tenant']
$neutron_config = hiera_hash('neutron_config')
$floating_net = try_get_value($neutron_config, 'default_floating_net', 'net04_ext')

2
deployment/puppet/osnailyfacter/modular/openstack-network/routers.pp
View File

@ -11,7 +11,7 @@ $controllers_num = size(get_nodes_hash_by_roles(hiera_hash('network_met
if $use_neutron {
$access_hash = hiera('access', { })
$access_hash = hiera_hash('access', {})
$keystone_admin_tenant = pick($access_hash['tenant'], 'admin')
$neutron_config = hiera_hash('neutron_config')
$floating_net = try_get_value($neutron_config, 'default_floating_net', 'net04_ext')

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

@ -11,7 +11,7 @@ if $queue_provider == 'rabbitmq' {
$erlang_cookie = hiera('erlang_cookie', 'EOKOWXQREETZSHFNTPEY')
$version = hiera('rabbit_version', '3.3.5')
$amqp_port = hiera('amqp_port', '5673')
$rabbit_hash = hiera_hash('rabbit_hash',
$rabbit_hash = hiera_hash('rabbit',
{
'user' => false,
'password' => false,

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

@ -5,7 +5,7 @@ $network_scheme = hiera_hash('network_scheme', {})
$network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
$cinder_hash = hiera_hash('cinder_hash', {})
$cinder_hash = hiera_hash('cinder', {})
$storage_address = get_network_role_property('cinder/iscsi', 'ipaddr')
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')
@ -17,18 +17,18 @@ $debug = pick($cinder_hash['debug'], hiera('debug', tru
$use_monit = false
$auto_assign_floating_ip = hiera('auto_assign_floating_ip', false)
$node_volumes = hiera('node_volumes', [])
$storage_hash = hiera_hash('storage_hash', {})
$vcenter_hash = hiera('vcenter', {})
$nova_hash = hiera_hash('nova_hash', {})
$storage_hash = hiera_hash('storage', {})
$vcenter_hash = hiera_hash('vcenter', {})
$nova_hash = hiera_hash('nova', {})
$mysql_hash = hiera_hash('mysql', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$glance_hash = hiera_hash('glance_hash', {})
$keystone_hash = hiera_hash('keystone_hash', {})
$ceilometer_hash = hiera_hash('ceilometer_hash',{})
$access_hash = hiera('access', {})
$rabbit_hash = hiera_hash('rabbit', {})
$glance_hash = hiera_hash('glance', {})
$keystone_hash = hiera_hash('keystone', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$access_hash = hiera_hash('access', {})
$neutron_mellanox = hiera('neutron_mellanox', false)
$syslog_hash = hiera('syslog', {})
$base_syslog_hash = hiera('base_syslog', {})
$syslog_hash = hiera_hash('syslog', {})
$base_syslog_hash = hiera_hash('base_syslog', {})
$use_stderr = hiera('use_stderr', false)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_glance = hiera('syslog_log_facility_glance', 'LOG_LOCAL2')

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

@ -26,29 +26,29 @@ $database_vip = hiera('database_vip')
$service_endpoint = hiera('service_endpoint')
$primary_controller = hiera('primary_controller')
$use_neutron = hiera('use_neutron', false)
$sahara_hash = hiera('sahara', {})
$murano_hash = hiera('murano', {})
$sahara_hash = hiera_hash('sahara', {})
$murano_hash = hiera_hash('murano', {})
$mp_hash = hiera('mp')
$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)
$storage_hash = hiera_hash('storage_hash', {})
$vcenter_hash = hiera('vcenter', {})
$nova_hash = hiera_hash('nova_hash', {})
$nova_custom_hash = hiera_hash('nova_custom_hash', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$glance_hash = hiera_hash('glance_hash', {})
$keystone_hash = hiera_hash('keystone_hash', {})
$swift_hash = hiera_hash('swift_hash', {})
$cinder_hash = hiera_hash('cinder_hash', {})
$ceilometer_hash = hiera_hash('ceilometer_hash',{})
$access_hash = hiera('access', {})
$storage_hash = hiera_hash('storage', {})
$vcenter_hash = hiera_hash('vcenter', {})
$nova_hash = hiera_hash('nova', {})
$nova_custom_hash = hiera_hash('nova_custom', {})
$rabbit_hash = hiera_hash('rabbit', {})
$glance_hash = hiera_hash('glance', {})
$keystone_hash = hiera_hash('keystone', {})
$swift_hash = hiera_hash('swift', {})
$cinder_hash = hiera_hash('cinder', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$access_hash = hiera_hash('access', {})
$swift_proxies = hiera('swift_proxies')
$swift_master_role = hiera('swift_master_role', 'primary-controller')
$neutron_mellanox = hiera('neutron_mellanox', false)
$syslog_hash = hiera('syslog', {})
$base_syslog_hash = hiera('base_syslog', {})
$syslog_hash = hiera_hash('syslog', {})
$base_syslog_hash = hiera_hash('base_syslog', {})
$use_syslog = hiera('use_syslog', true)
$use_stderr = hiera('use_stderr', false)
$syslog_log_facility_glance = hiera('syslog_log_facility_glance', 'LOG_LOCAL2')
@ -62,7 +62,7 @@ $nova_rate_limits = hiera('nova_rate_limits')
$nova_report_interval = hiera('nova_report_interval')
$nova_service_down_time = hiera('nova_service_down_time')
$config_drive_format = 'vfat'
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$use_huge_pages = pick($nova_hash['enable_hugepages'], false)

2
deployment/puppet/osnailyfacter/modular/roles/ironic-conductor.pp
View File

@ -20,7 +20,7 @@ $debug = hiera('debug', false)
$verbose = hiera('verbose', true)
$use_syslog = hiera('use_syslog', true)
$syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_USER')
$rabbit_hash = hiera_hash('rabbit_hash')
$rabbit_hash = hiera_hash('rabbit')
$amqp_durable_queues = pick($ironic_hash['amqp_durable_queues'], false)
$storage_hash = hiera('storage')

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

@ -9,7 +9,7 @@ $mongo_hosts = suffix(values($mongo_address_map), ":${mongodb_port}")
$bind_address = get_network_role_property('mongo/db', 'ipaddr')
$use_syslog = hiera('use_syslog', true)
$debug = pick($mongo_hash['debug'], hiera('debug', false))
$ceilometer_hash = hiera_hash('ceilometer_hash')
$ceilometer_hash = hiera_hash('ceilometer')
$roles = hiera('roles')
$replset_name = 'ceilometer'
$keyfile = '/etc/mongodb.key'

2
deployment/puppet/osnailyfacter/modular/sahara/db.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: sahara/db.pp')
$sahara_hash = hiera_hash('sahara_hash', {})
$sahara_hash = hiera_hash('sahara', {})
$sahara_enabled = pick($sahara_hash['enabled'], false)
$mysql_hash = hiera_hash('mysql', {})
$management_vip = hiera('management_vip', undef)

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

@ -1,7 +1,7 @@
notice('MODULAR: sahara/keystone.pp')
$sahara_hash = hiera_hash('sahara_hash', {})
$public_ssl_hash = hiera('public_ssl')
$sahara_hash = hiera_hash('sahara', {})
$public_ssl_hash = hiera_hash('public_ssl')
$public_vip = hiera('public_vip')
$admin_address = hiera('management_vip')
$api_bind_port = '8386'

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

@ -2,11 +2,11 @@ notice('MODULAR: sahara.pp')
prepare_network_config(hiera_hash('network_scheme', {}))
$access_admin = hiera_hash('access_hash', {})
$sahara_hash = hiera_hash('sahara_hash', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$public_ssl_hash = hiera('public_ssl')
$ceilometer_hash = hiera_hash('ceilometer_hash', {})
$access_admin = hiera_hash('access', {})
$sahara_hash = hiera_hash('sahara', {})
$rabbit_hash = hiera_hash('rabbit', {})
$public_ssl_hash = hiera_hash('public_ssl')
$ceilometer_hash = hiera_hash('ceilometer', {})
$primary_controller = hiera('primary_controller')
$public_vip = hiera('public_vip')
$database_vip = hiera('database_vip', undef)

2
deployment/puppet/osnailyfacter/modular/ssl/ssl_add_trust_chain.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: ssl_add_trust_chain.pp')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
Exec {

2
deployment/puppet/osnailyfacter/modular/ssl/ssl_dns_setup.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: ssl_dns_setup.pp')
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_vip = hiera('public_vip')
$management_vip = hiera('management_vip')

2
deployment/puppet/osnailyfacter/modular/swift/keystone.pp
View File

@ -5,7 +5,7 @@ $public_vip = hiera('public_vip')
# Allow a plugin to override the admin address using swift_hash:
$management_vip = pick($swift_hash['management_vip'], hiera('management_vip'))
$region = pick($swift_hash['region'], hiera('region', 'RegionOne'))
$public_ssl_hash = hiera('public_ssl')
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$public_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'swift', 'public', 'protocol', 'http')

2
deployment/puppet/osnailyfacter/modular/swift/rebalance_cronjob.pp
View File

@ -2,7 +2,7 @@ notice('MODULAR: swift/rebalance_cronjob.pp')
$network_metadata = hiera_hash('network_metadata')
$storage_hash = hiera('storage_hash')
$storage_hash = hiera('storage')
$swift_master_role = hiera('swift_master_role', 'primary-controller')
$ring_min_part_hours = hiera('swift_ring_min_part_hours', 1)

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

@ -4,7 +4,7 @@ $network_scheme = hiera_hash('network_scheme', {})
$network_metadata = hiera_hash('network_metadata', {})
prepare_network_config($network_scheme)
$swift_hash = hiera_hash('swift_hash')
$swift_hash = hiera_hash('swift')
$swift_master_role = hiera('swift_master_role', 'primary-controller')
$swift_nodes = hiera_hash('swift_nodes', {})
$swift_operator_roles = pick($swift_hash['swift_operator_roles'], ['admin', 'SwiftOperator'])
@ -12,7 +12,7 @@ $swift_proxies_addr_list = values(get_node_to_ipaddr_map_by_network_role(hier
$memcaches_addr_list = hiera('memcached_addresses')
$is_primary_swift_proxy = hiera('is_primary_swift_proxy', false)
$proxy_port = hiera('proxy_port', '8080')
$storage_hash = hiera_hash('storage_hash')
$storage_hash = hiera_hash('storage')
$mp_hash = hiera('mp')
$management_vip = hiera('management_vip')
$public_vip = hiera('public_vip')
@ -35,7 +35,7 @@ $workers_max = hiera('workers_max', 16)
$service_workers = pick($swift_hash['workers'],
min(max($::processorcount, 2), $workers_max))
$ssl_hash = hiera_hash('use_ssl', {})
$rabbit_hash = hiera_hash('rabbit_hash')
$rabbit_hash = hiera_hash('rabbit')
$rabbit_hosts = hiera('amqp_hosts')
$internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', [pick($swift_hash['auth_protocol'], 'http')])

2
deployment/puppet/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: public_vip_ping.pp')
$network_scheme = hiera_hash('network_scheme',{})
$network_scheme = hiera_hash('network_scheme', {})
prepare_network_config($network_scheme)
$run_ping_checker = hiera('run_ping_checker', true)
$public_iface = get_network_role_property('public/vip', 'interface')

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

@ -1,6 +1,6 @@
notice('MODULAR: cinder-vmware.pp')
$cinder_hash = hiera_hash('cinder_hash', {})
$cinder_hash = hiera_hash('cinder', {})
if roles_include(['cinder-vmware']) {
$debug = pick($cinder_hash['debug'], hiera('debug', true))

6
deployment/puppet/osnailyfacter/modular/vmware/compute-vmware.pp
View File

@ -2,7 +2,7 @@ notice('MODULAR: vmware/compute-vmware.pp')
$debug = hiera('debug', true)
$vcenter_hash = hiera('vcenter', {})
$vcenter_hash = hiera_hash('vcenter', {})
$computes_hash = parse_vcenter_settings($vcenter_hash['computes'])
$defaults = {
@ -10,10 +10,10 @@ $defaults = {
vlan_interface => $vcenter_hash['esxi_vlan_interface']
}
create_resources(vmware::compute_vmware, $computes_hash, $defaults)
create_resources(vmware::compute_vmware, $computes, $defaults)
$ceilometer_hash = hiera('ceilometer', {})
$ceilometer_hash = hiera_hash('ceilometer', {})
$ceilometer_enabled = $ceilometer_hash['enabled']
if $ceilometer_enabled {

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

@ -1,12 +1,12 @@
notice('MODULAR: vmware/vcenter.pp')
$use_vcenter = hiera('use_vcenter', false)
$vcenter_hash = hiera('vcenter_hash')
$vcenter_hash = hiera_hash('vcenter')
$public_vip = hiera('public_vip')
$use_neutron = hiera('use_neutron', false)
$ceilometer_hash = hiera('ceilometer',{})
$nova_hash = hiera_hash('nova_hash', {})
$public_ssl_hash = hiera('public_ssl')
$ceilometer_hash = hiera_hash('ceilometer', {})
$nova_hash = hiera_hash('nova', {})
$public_ssl_hash = hiera_hash('public_ssl')
$ssl_hash = hiera_hash('use_ssl', {})
$vncproxy_protocol = get_ssl_property($ssl_hash, $public_ssl_hash, 'nova', 'public', 'protocol', [$nova_hash['vncproxy_protocol'], 'http'])
$vncproxy_host = get_ssl_property($ssl_hash, $public_ssl_hash, 'nova', 'public', 'hostname', [$public_vip])

34
deployment/puppet/osnailyfacter/templates/globals_yaml.erb
View File

@ -1,6 +1,6 @@
<% require "yaml" -%>
<% globals = {} -%>
<% globals.store "access_hash", @access_hash -%>
<% globals.store "access", @access_hash -%>
<% globals.store "amqp_hosts", @amqp_hosts -%>
<% globals.store "amqp_port", @amqp_port -%>
<% globals.store "aodh_hash", @aodh -%>
@ -8,14 +8,14 @@
<% globals.store "apache_api_proxy_address", @apache_api_proxy_address -%>
<% globals.store "apache_ports", @apache_ports -%>
<% globals.store "base_mac", @base_mac -%>
<% globals.store "base_syslog_hash", @base_syslog_hash -%>
<% globals.store "base_syslog", @base_syslog_hash -%>
<% globals.store "ceph_tuning_settings", @ceph_tuning_settings -%>
<% globals.store "ceph_monitor_nodes", @ceph_monitor_nodes -%>
<% globals.store "ceph_primary_monitor_node", @ceph_primary_monitor_node -%>
<% globals.store "ceph_rgw_nodes", @ceph_rgw_nodes -%>
<% globals.store "ceilometer_hash", @real_ceilometer_hash -%>
<% globals.store "ceilometer", @real_ceilometer_hash -%>
<% globals.store "ceilometer_nodes", @ceilometer_nodes -%>
<% globals.store "cinder_hash", @cinder_hash -%>
<% globals.store "cinder", @cinder_hash -%>
<% globals.store "cinder_nodes", @cinder_nodes -%>
<% globals.store "cinder_rate_limits", @cinder_rate_limits -%>
<% globals.store "corosync_roles", @corosync_roles -%>
@ -26,17 +26,17 @@
<% globals.store "deployment_mode", @deployment_mode -%>
<% globals.store "dns_nameservers", @dns_nameservers -%>
<% globals.store "glance_backend", @glance_backend -%>
<% globals.store "glance_hash", @glance_hash -%>
<% globals.store "glance", @glance_hash -%>
<% globals.store "glance_known_stores", @glance_known_stores -%>
<% globals.store "glance_nodes", @glance_nodes -%>
<% globals.store "heat_hash", @heat_hash -%>
<% globals.store "heat", @heat_hash -%>
<% globals.store "heat_nodes", @heat_nodes -%>
<% globals.store "heat_roles", @heat_roles -%>
<% globals.store "horizon_nodes", @horizon_nodes -%>
<% globals.store "custom_theme_path", @custom_theme_path -%>
<% globals.store "node_name", @node_name -%>
<% globals.store "idle_timeout", @idle_timeout -%>
<% globals.store "keystone_hash", @keystone_hash -%>
<% globals.store "keystone", @keystone_hash -%>
<% globals.store "keystone_nodes", @keystone_nodes -%>
<% globals.store "manage_volumes", @manage_volumes -%>
<% globals.store "management_network_range", @management_network_range -%>
@ -48,10 +48,10 @@
<% globals.store "mountpoints", @mountpoints -%>
<% globals.store "mongo_roles", @mongo_roles -%>
<% globals.store "multi_host", @multi_host -%>
<% globals.store "murano_hash", @murano_hash -%>
<% globals.store "murano", @murano_hash -%>
<% globals.store "murano_nodes", @murano_nodes -%>
<% globals.store "murano_roles", @murano_roles -%>
<% globals.store "mysql_hash", @mysql_hash -%>
<% globals.store "mysql", @mysql_hash -%>
<% globals.store "network_config", @network_config -%>
<% globals.store "network_manager", @network_manager -%>
<% globals.store "network_scheme", @network_scheme -%>
@ -61,9 +61,9 @@
<% globals.store "neutron_metadata_proxy_secret", @neutron_metadata_proxy_secret -%>
<% globals.store "neutron_nodes", @neutron_nodes -%>
<% globals.store "neutron_user_password", @neutron_user_password -%>
<% globals.store "node_hash", @node_hash -%>
<% globals.store "node", @node_hash -%>
<% globals.store "nova_db_password", @nova_db_password -%>
<% globals.store "nova_hash", @real_nova_hash -%>
<% globals.store "nova", @real_nova_hash -%>
<% globals.store "nova_rate_limits", @nova_rate_limits -%>
<% globals.store "nova_report_interval", @nova_report_interval -%>
<% globals.store "nova_service_down_time", @nova_service_down_time -%>
@ -74,15 +74,15 @@
<% globals.store "private_int", @private_int -%>
<% globals.store "queue_provider", @queue_provider -%>
<% globals.store "rabbit_ha_queues", @rabbit_ha_queues -%>
<% globals.store "rabbit_hash", @real_rabbit_hash -%>
<% globals.store "rabbit", @real_rabbit_hash -%>
<% globals.store "roles", @roles -%>
<% globals.store "sahara_hash", @sahara_hash -%>
<% globals.store "sahara", @sahara_hash -%>
<% globals.store "sahara_nodes", @sahara_nodes -%>
<% globals.store "sahara_roles", @sahara_roles -%>
<% globals.store "sql_connection", @sql_connection -%>
<% globals.store "storage_hash", @storage_hash_real -%>
<% globals.store "swift_hash", @swift_hash -%>
<% globals.store "syslog_hash", @syslog_hash -%>
<% globals.store "storage", @storage_hash_real -%>
<% globals.store "swift", @swift_hash -%>
<% globals.store "syslog", @syslog_hash -%>
<% globals.store "default_log_levels", @default_log_levels -%>
<% globals.store "aodh::logging::default_log_levels", @default_log_levels -%>
<% globals.store "ceilometer::logging::default_log_levels", @default_log_levels -%>
@ -113,7 +113,7 @@
<% globals.store "use_neutron", @use_neutron -%>
<% globals.store "use_ovs", @use_ovs -%>
<% globals.store "use_syslog", @use_syslog -%>
<% globals.store "vcenter_hash", @vcenter_hash -%>
<% globals.store "vcenter", @vcenter_hash -%>
<% globals.store "verbose", @verbose -%>
<% globals.store "vlan_start", @vlan_start -%>
<% globals.store "management_vip", @management_vip -%>

2
tests/noop/spec/hosts/aodh/aodh_spec.rb
View File

@ -51,7 +51,7 @@ describe manifest do
db_password = aodh_hash['db_password']
rabbit_ha_queues = Noop.hiera 'rabbit_ha_queues'
rabbit_hash = Noop.hiera_structure 'rabbit_hash', {}
rabbit_hash = Noop.hiera_hash 'rabbit', {}
rabbit_userid = rabbit_hash.fetch('user', 'nova')
rabbit_password = rabbit_hash['password']

2
tests/noop/spec/hosts/astute/dump_rabbitmq_definitions_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'astute/dump_rabbitmq_definitions.pp'
describe manifest do
shared_examples 'catalog' do
rabbit_hash = Noop.hiera_structure 'rabbit_hash'
rabbit_hash = Noop.hiera_structure 'rabbit'
original_definitions_dump_file = '/etc/rabbitmq/definitions.full'
rabbit_api_endpoint = 'http://localhost:15672/api/definitions'

2
tests/noop/spec/hosts/astute/service_token_off_spec.rb
View File

@ -5,7 +5,7 @@ manifest = 'astute/service_token_off.pp'
describe manifest do
shared_examples 'catalog' do
keystone_params = Noop.hiera_structure 'keystone_hash'
keystone_params = Noop.hiera_structure 'keystone'
if keystone_params['service_token_off']
it 'should contain apache/mod_wsgi keystone service' do

2
tests/noop/spec/hosts/ceilometer/radosgw_user_spec.rb
View File

@ -6,7 +6,7 @@ describe manifest do
shared_examples 'catalog' do
ceilometer_hash = Noop.hiera_structure 'ceilometer'
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
if ceilometer_hash['enabled'] and storage_hash['objects_ceph']
it 'should configure Ceilometer user in RadosGW' do

2
tests/noop/spec/hosts/ceph/ceph-init_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'ceph/init.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
it "should contain ceph service" do
case facts[:operatingsystem]

4
tests/noop/spec/hosts/ceph/ceph-osd_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'ceph/ceph-osd.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
ceph_monitor_nodes = Noop.hiera 'ceph_monitor_nodes'
service_endpoint = Noop.hiera 'service_endpoint'
if storage_hash['debug']
@ -14,7 +14,7 @@ describe manifest do
end
ceph_tuning_settings = Noop.hiera 'ceph_tuning_settings'
public_ssl_hash = Noop.hiera('public_ssl')
public_ssl_hash = Noop.hiera_hash('public_ssl')
let(:ssl_hash) { Noop.hiera_hash 'use_ssl', {} }
let(:admin_auth_protocol) { Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone', 'admin','protocol','http' }
let(:admin_auth_address) { Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone','admin', 'hostname', [Noop.hiera('service_endpoint', Noop.hiera('management_vip'))]}

2
tests/noop/spec/hosts/ceph/ceph_compute_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'ceph/ceph_compute.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
if (storage_hash['volumes_ceph'] or
storage_hash['images_ceph'] or

2
tests/noop/spec/hosts/ceph/ceph_pools_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'ceph/ceph_pools.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
glance_pool = 'images'
cinder_pool = 'volumes'
cinder_backup_pool = 'backups'

2
tests/noop/spec/hosts/ceph/mon_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'ceph/mon.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
ceph_monitor_nodes = Noop.hiera 'ceph_monitor_nodes'
if (storage_hash['volumes_ceph'] or

4
tests/noop/spec/hosts/ceph/radosgw_spec.rb
View File

@ -4,9 +4,9 @@ manifest = 'ceph/radosgw.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
ceph_monitor_nodes = Noop.hiera 'ceph_monitor_nodes'
public_ssl_hash = Noop.hiera('public_ssl')
public_ssl_hash = Noop.hiera_hash('public_ssl')
let(:ssl_hash) { Noop.hiera_hash 'use_ssl', {} }

2
tests/noop/spec/hosts/ceph/updatedb_spec.rb
View File

@ -4,7 +4,7 @@ manifest = 'ceph/updatedb.pp'
describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage'
storage_hash = Noop.hiera_hash 'storage'
if (storage_hash['images_ceph'] or storage_hash['objects_ceph'] or storage_hash['objects_ceph'])
it { should contain_exec('Ensure /var/lib/ceph in the updatedb PRUNEPATH').with(

2
tests/noop/spec/hosts/glance/glance_spec.rb
View File

@ -32,7 +32,7 @@ describe manifest do
else
pipeline = 'keystone'
end
murano_glance_artifacts_plugin = Noop.hiera('murano_glance_artifacts_plugin', {})
murano_glance_artifacts_plugin = Noop.hiera_hash('murano_glance_artifacts_plugin', {})
database_vip = Noop.hiera('database_vip')
glance_db_password = Noop.hiera_structure 'glance/db_password', 'glance'
glance_db_user = Noop.hiera_structure 'glance/db_user', 'glance'

2
tests/noop/spec/hosts/horizon/horizon_spec.rb
View File

@ -67,7 +67,7 @@ describe manifest do
end
end
storage_hash = Noop.hiera 'storage_hash'
storage_hash = Noop.hiera_hash 'storage'
let(:cinder_options) do
{ 'enable_backup' => storage_hash.fetch('volumes_ceph', false) }
end

2
tests/noop/spec/hosts/ironic/ironic-compute_spec.rb
View File

@ -43,7 +43,7 @@ describe manifest do
end
end
public_ssl_hash = Noop.hiera('public_ssl')
public_ssl_hash = Noop.hiera_hash('public_ssl')
let(:ssl_hash) { Noop.hiera_hash 'use_ssl', {} }
let(:admin_auth_protocol) { Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone', 'admin','protocol','http' }
let(:admin_auth_address) { Noop.puppet_function 'get_ssl_property',ssl_hash,{},'keystone','admin', 'hostname', [Noop.hiera('service_endpoint', Noop.hiera('management_vip'))]}

6
tests/noop/spec/hosts/keystone/keystone_spec.rb
View File

@ -48,7 +48,7 @@ describe manifest do
admin_token = Noop.hiera_structure 'keystone/admin_token'
public_vip = Noop.hiera('public_vip')
management_vip= Noop.hiera('management_vip')
public_ssl_hash = Noop.hiera('public_ssl')
public_ssl_hash = Noop.hiera_hash('public_ssl')
let(:auth_suffix) { Noop.puppet_function 'pick', keystone_hash['auth_suffix'], '/' }
@ -74,8 +74,8 @@ describe manifest do
revoke_driver = 'keystone.contrib.revoke.backends.sql.Revoke'
database_idle_timeout = '3600'
ceilometer_hash = Noop.hiera 'ceilometer_hash', { 'enabled' => false }
murano_hash = Noop.hiera 'murano_hash', { 'enabled' => false }
ceilometer_hash = Noop.hiera_hash 'ceilometer', { 'enabled' => false }
murano_hash = Noop.hiera_hash 'murano', { 'enabled' => false }
murano_hash['plugins'] = { 'glance_artifacts_plugin' => { 'enabled' => false } }
murano_plugins = murano_hash['plugins']
murano_glare_plugin = murano_plugins['glance_artifacts_plugin']

2
tests/noop/spec/hosts/murano/cfapi_spec.rb
View File

@ -5,7 +5,7 @@ manifest = 'murano/cfapi.pp'
describe manifest do
shared_examples 'catalog' do
let(:tenant) { Noop.hiera_structure('access_hash/tenant', 'admin') }
let(:tenant) { Noop.hiera_structure('access/tenant', 'admin') }
let(:network_scheme) do
Noop.hiera_hash 'network_scheme'

4
tests/noop/spec/hosts/murano/keystone_cfapi_spec.rb
View File

@ -40,9 +40,9 @@ describe manifest do
end
let(:region) { Noop.hiera('region', 'RegionOne') }
let(:tenant) { Noop.hiera_structure('murano_hash/tenant', 'services') }
let(:tenant) { Noop.hiera_structure('murano/tenant', 'services') }
let(:murano_password) { Noop.hiera_structure('murano_hash/user_password') }
let(:murano_password) { Noop.hiera_structure('murano/user_password') }
##########################################################################

4
tests/noop/spec/hosts/murano/keystone_spec.rb
View File

@ -34,9 +34,9 @@ describe manifest do
let(:region) { Noop.hiera('region', 'RegionOne') }
let(:tenant) { Noop.hiera_structure('murano_hash/tenant', 'services') }
let(:tenant) { Noop.hiera_structure('murano/tenant', 'services') }
let(:murano_password) { Noop.hiera_structure('murano_hash/user_password') }
let(:murano_password) { Noop.hiera_structure('murano/user_password') }
##########################################################################

2
tests/noop/spec/hosts/murano/murano_spec.rb
View File

@ -119,7 +119,7 @@ describe manifest do
let(:default_dns) { Noop.hiera_structure('external_dns/dns_list') }
murano_glance_artifacts_plugin = Noop.hiera('murano_glance_artifacts_plugin', {})
murano_glance_artifacts_plugin = Noop.hiera_hash('murano_glance_artifacts_plugin', {})
#############################################################################

4
tests/noop/spec/hosts/openstack-cinder/create_cinder_types_spec.rb
View File

@ -5,10 +5,10 @@ manifest = 'openstack-cinder/create_cinder_types.pp'
describe manifest do
shared_examples 'catalog' do
access_admin = Noop.hiera_structure('access_hash', {})
access_admin = Noop.hiera_structure('access', {})
public_vip = Noop.hiera('public_vip')
region = Noop.hiera('region', 'RegionOne')
volume_backend_names = Noop.hiera_structure 'storage_hash/volume_backend_names'
volume_backend_names = Noop.hiera_structure 'storage/volume_backend_names'
available_backends = volume_backend_names.delete_if { |key,value| ! value }
backend_names = available_backends.keys

6
tests/noop/spec/hosts/openstack-cinder/openstack-cinder_spec.rb
View File

@ -25,7 +25,7 @@ describe manifest do
default_log_levels_hash = Noop.hiera_hash 'default_log_levels'
default_log_levels = Noop.puppet_function 'join_keys_to_values',default_log_levels_hash,'='
primary_controller = Noop.hiera 'primary_controller'
volume_backend_name = Noop.hiera_structure 'storage_hash/volume_backend_names'
volume_backend_name = Noop.hiera_structure 'storage/volume_backend_names'
database_vip = Noop.hiera('database_vip')
cinder = Noop.puppet_function 'roles_include', 'cinder'
@ -37,8 +37,8 @@ describe manifest do
ubuntu_tgt_service_name = 'tgt'
ubuntu_tgt_package_name = 'tgt'
sahara = Noop.hiera_structure 'sahara_hash/enabled'
storage = Noop.hiera_hash 'storage_hash'
sahara = Noop.hiera_structure 'sahara/enabled'
storage = Noop.hiera_hash 'storage'
let(:manage_volumes) do
if cinder and storage['volumes_lvm']

4
tests/noop/spec/hosts/openstack-controller/openstack-controller_spec.rb
View File

@ -67,7 +67,7 @@ describe manifest do
let(:api_db_name) { Noop.hiera_structure 'nova/api_db_name', 'nova_api' }
let(:nova_hash) { Noop.hiera_hash 'nova_hash' }
let(:nova_hash) { Noop.hiera_hash 'nova' }
let(:ssl_hash) { Noop.hiera_hash 'use_ssl', {} }
@ -106,7 +106,7 @@ describe manifest do
let(:auto_assign_floating_ip) { Noop.hiera 'auto_assign_floating_ip', false }
let(:amqp_hosts) { Noop.hiera 'amqp_hosts', '' }
let(:rabbit_hash) { Noop.hiera_hash 'rabbit_hash', {} }
let(:rabbit_hash) { Noop.hiera_hash 'rabbit', {} }
let(:rabbit_hosts) { Noop.puppet_function 'split', amqp_hosts, ',' }
let(:openstack_controller_hash) { Noop.hiera_hash 'openstack_controller', {} }
let(:verbose) { Noop.puppet_function 'pick', openstack_controller_hash['verbose'], true }

4
tests/noop/spec/hosts/openstack-network/common-config_spec.rb
View File

@ -21,7 +21,7 @@ describe manifest do
context 'with Neutron' do
neutron_config = Noop.hiera('neutron_config')
openstack_network_hash = Noop.hiera('openstack_network', { })
openstack_network_hash = Noop.hiera('openstack_network', {})
adv_neutron_config = Noop.hiera_hash('neutron_advanced_configuration', {})
enable_qos = adv_neutron_config.fetch('neutron_qos', false)
service_plugins = [
@ -69,7 +69,7 @@ describe manifest do
}
it 'RMQ options' do
rabbit_hash = Noop.hiera('rabbit_hash', { })
rabbit_hash = Noop.hiera_hash('rabbit', {})
should contain_class('neutron').with('rabbit_user' => rabbit_hash['user'])
should contain_class('neutron').with('rabbit_password' => rabbit_hash['password'])
should contain_class('neutron').with('rabbit_hosts' => Noop.hiera('amqp_hosts', '').split(','))

2
tests/noop/spec/hosts/openstack-network/compute-nova_spec.rb
View File

@ -62,7 +62,7 @@ describe manifest do
end
let(:network_config) do
Noop.hiera('network_config', {})
Noop.hiera_hash('network_config', {})
end
let(:dns_nameservers) do

2
tests/noop/spec/hosts/openstack-network/compute-vcenter_spec.rb
View File

@ -52,7 +52,7 @@ describe manifest do
end
let(:network_config) do
Noop.hiera('network_config', {})
Noop.hiera_hash('network_config', {})
end
let(:dns_nameservers) do

2
tests/noop/spec/hosts/openstack-network/server-nova_spec.rb
View File

@ -77,7 +77,7 @@ describe manifest do
public_interface = Noop.hiera('public_int')
fixed_range = Noop.hiera('fixed_network_range')
network_manager = Noop.hiera('network_manager')
network_config = Noop.hiera('network_config', {})
network_config = Noop.hiera_hash('network_config', {})
num_networks = Noop.hiera('num_networks')
network_size = Noop.hiera('network_size')
nameservers = Noop.hiera_array('dns_nameservers', [])

2
tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb
View File

@ -48,7 +48,7 @@ describe manifest do
workers_max = Noop.hiera 'workers_max'
debug = Noop.hiera('debug', false)
threads_max = 2*workers_max.to_i
rabbit_hash = Noop.hiera_structure 'rabbit_hash'
rabbit_hash = Noop.hiera_structure 'rabbit'
use_pacemaker = rabbit_hash.fetch(['pacemaker'], true)
pid_file = rabbit_hash.fetch('pid_file', '/var/run/rabbitmq/p_pid')
file_limit = rabbit_hash.fetch('file_limits', 100000)

6
tests/noop/spec/hosts/roles/cinder_spec.rb
View File

@ -15,8 +15,8 @@ describe manifest do
shared_examples 'catalog' do
storage_hash = Noop.hiera 'storage_hash'
ceilometer_hash = Noop.hiera 'ceilometer_hash', { 'enabled' => false }
storage_hash = Noop.hiera_hash 'storage'
ceilometer_hash = Noop.hiera_hash 'ceilometer', { 'enabled' => false }
use_ceph = Noop.hiera 'use_ceph'
volume_backend_name = storage_hash['volume_backend_names']
@ -113,7 +113,7 @@ describe manifest do
end
let :ceilometer_hash do
Noop.hiera 'ceilometer_hash', { 'enabled' => false }
Noop.hiera_hash 'ceilometer', { 'enabled' => false }
end
if ceilometer_hash['enabled']

10
tests/noop/spec/hosts/sahara/keystone_spec.rb
View File

@ -13,11 +13,11 @@ describe manifest do
let(:public_protocol) { public_ssl ? 'https' : 'http' }
let(:public_address) { public_ssl ? public_ssl_hostname : public_vip }
let(:sahara_user) { Noop.hiera_structure('sahara_hash/user', 'sahara') }
let(:sahara_password) { Noop.hiera_structure('sahara_hash/user_password') }
let(:tenant) { Noop.hiera_structure('sahara_hash/tenant', 'services') }
let(:region) { Noop.hiera_structure('sahara_hash/region', 'RegionOne') }
let(:service_name) { Noop.hiera_structure('sahara_hash/service_name', 'sahara') }
let(:sahara_user) { Noop.hiera_structure('sahara/user', 'sahara') }
let(:sahara_password) { Noop.hiera_structure('sahara/user_password') }
let(:tenant) { Noop.hiera_structure('sahara/tenant', 'services') }
let(:region) { Noop.hiera_structure('sahara/region', 'RegionOne') }
let(:service_name) { Noop.hiera_structure('sahara/service_name', 'sahara') }
let(:public_url) { "#{public_protocol}://#{public_address}:#{api_bind_port}/v1.1/%(tenant_id)s" }
let(:admin_url) { "http://#{admin_address}:#{api_bind_port}/v1.1/%(tenant_id)s" }

14
tests/noop/spec/hosts/sahara/sahara_spec.rb
View File

@ -90,14 +90,14 @@ describe manifest do
it 'should declare sahara class correctly' do
facts[:processorcount] = 10
sahara_plugins = %w(ambari cdh mapr spark vanilla)
sahara_user = Noop.hiera_structure('sahara_hash/user', 'sahara')
sahara_password = Noop.hiera_structure('sahara_hash/user_password')
sahara_user = Noop.hiera_structure('sahara/user', 'sahara')
sahara_password = Noop.hiera_structure('sahara/user_password')
primary_controller = Noop.hiera 'primary_controller'
tenant = Noop.hiera_structure('sahara_hash/tenant', 'services')
db_user = Noop.hiera_structure('sahara_hash/db_user', 'sahara')
db_name = Noop.hiera_structure('sahara_hash/db_name', 'sahara')
db_password = Noop.hiera_structure('sahara_hash/db_password')
db_host = Noop.hiera_structure('sahara_hash/db_host', database_vip)
tenant = Noop.hiera_structure('sahara/tenant', 'services')
db_user = Noop.hiera_structure('sahara/db_user', 'sahara')
db_name = Noop.hiera_structure('sahara/db_name', 'sahara')
db_password = Noop.hiera_structure('sahara/db_password')
db_host = Noop.hiera_structure('sahara/db_host', database_vip)
max_pool_size =[facts[:processorcount] * 5 + 0, 30 + 0].min
max_overflow = [facts[:processorcount] * 5 + 0, 60 + 0].min
max_retries = '-1'

2
tests/noop/spec/hosts/ssl/ssl_keys_saving_spec.rb
View File

@ -67,7 +67,7 @@ describe manifest do
end
end
elsif Noop.hiera('public_ssl', false)
elsif Noop.hiera_hash('public_ssl', false)
certdata = Noop.hiera_structure "public_ssl/cert_data/content"
it "should create certificate file for public endpoints in /var/" do
should contain_file("/var/lib/astute/haproxy/public_haproxy.pem").with(

18
tests/noop/spec/hosts/swift/swift_spec.rb
View File

@ -4,17 +4,17 @@ manifest = 'swift/swift.pp'
describe manifest do
shared_examples 'catalog' do
workers_max = Noop.hiera 'workers_max'
role = Noop.hiera 'role'
storage_hash = Noop.hiera 'storage'
swift_hash = Noop.hiera 'swift'
network_scheme = Noop.hiera_hash 'network_scheme'
network_metadata = Noop.hiera_hash 'network_metadata'
workers_max = Noop.hiera 'workers_max'
role = Noop.hiera 'role'
storage_hash = Noop.hiera_hash 'storage'
swift_hash = Noop.hiera_hash 'swift'
network_scheme = Noop.hiera_hash 'network_scheme'
network_metadata = Noop.hiera_hash 'network_metadata'
memcached_nodes = Noop.puppet_function('get_nodes_hash_by_roles', network_metadata, ['primary-controller', 'controller'])
memcached_nodes = Noop.puppet_function('get_nodes_hash_by_roles', network_metadata, ['primary-controller', 'controller'])
memcached_addresses = Noop.hiera 'memcached_addresses'
memcached_port = Noop.hiera 'memcache_server_port', '11211'
memcached_servers = memcached_addresses.sort.map{ |n| n = n + ':' + memcached_port }
memcached_port = Noop.hiera 'memcache_server_port', '11211'
memcached_servers = memcached_addresses.sort.map{ |n| n = n + ':' + memcached_port }
swift_operator_roles = storage_hash.fetch('swift_operator_roles', ['admin', 'SwiftOperator'])
ring_part_power = swift_hash.fetch('ring_part_power', 10)