openstack
/
fuel-library
Code Issues Proposed changes

Use hiera_hash lookup for network_metadata 

Replace hiera() with hiera_hash() for 'network_metadata' key to
provide override possibility.

Closes-bug: #1524336

Change-Id: Id28397e4960badb0d1af86811afef6fb2c91f7dd
This commit is contained in:
Aleksandr Didenko 2015-12-08 12:20:19 +01:00
parent f267761dff
commit cb8437caf1
17 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ $rabbit_hash = hiera_hash('rabbit_hash')
$management_vip = hiera('management_vip')
$region = hiera('region', 'RegionOne')
$ceilometer_region = pick($ceilometer_hash['region'], $region)
$mongo_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('mongo_roles'))
$mongo_nodes = get_nodes_hash_by_roles(hiera_hash('network_metadata'), hiera('mongo_roles'))
$mongo_address_map = get_node_to_ipaddr_map_by_network_role($mongo_nodes, 'mongo/db')
$default_mongo_hash = {

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

@ -3,7 +3,7 @@ notice('MODULAR: horizon.pp')
prepare_network_config(hiera('network_scheme', {}))
$horizon_hash = hiera_hash('horizon', {})
$service_endpoint = hiera('service_endpoint')
$memcache_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('memcache_roles'))
$memcache_nodes = get_nodes_hash_by_roles(hiera_hash('network_metadata'), hiera('memcache_roles'))
$memcache_address_map = get_node_to_ipaddr_map_by_network_role($memcache_nodes, 'mgmt/memcache')
$bind_address = get_network_role_property('horizon', 'ipaddr')
$neutron_advanced_config = hiera_hash('neutron_advanced_configuration', {})

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

@ -57,7 +57,7 @@ $local_address_for_bind = get_network_role_property('keystone/api', 'ipaddr')
$memcache_server_port = hiera('memcache_server_port', '11211')
$memcache_pool_maxsize = '100'
$memcache_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('memcache_roles'))
$memcache_nodes = get_nodes_hash_by_roles(hiera_hash('network_metadata'), hiera('memcache_roles'))
$memcache_address_map = get_node_to_ipaddr_map_by_network_role($memcache_nodes, 'mgmt/memcache')
$public_port = '5000'

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

@ -56,7 +56,7 @@ $service_workers = pick($nova_hash['workers'],
min(max($::processorcount, 2), 16))
$ironic_hash = hiera_hash('ironic', {})
$memcache_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('memcache_roles'))
$memcache_nodes = get_nodes_hash_by_roles(hiera_hash('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', {})

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

@ -6,7 +6,7 @@ $neutron_advanced_config = hiera_hash('neutron_advanced_configuration', { })
# as HA routers can't be created when less then 2 L3 agents are available (Neutron limitation)
$l3_ha = pick($neutron_advanced_config['neutron_l3_ha'], false)
$neutron_controller_roles = hiera('neutron_controller_roles', ['controller', 'primary-controller'])
$controllers_num = size(get_nodes_hash_by_roles(hiera('network_metadata'), $neutron_controller_roles))
$controllers_num = size(get_nodes_hash_by_roles(hiera_hash('network_metadata'), $neutron_controller_roles))
if $use_neutron {

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

@ -128,7 +128,7 @@ $floating_hash = {}
##CALCULATED PARAMETERS
##TODO: simply parse nodes array
$memcache_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('memcache_roles'))
$memcache_nodes = get_nodes_hash_by_roles(hiera_hash('network_metadata'), hiera('memcache_roles'))
$memcache_ipaddrs = ipsort(values(get_node_to_ipaddr_map_by_network_role($memcache_nodes,'mgmt/memcache')))
$roles = $network_metadata['nodes'][$node_name]['node_roles']
$mountpoints = filter_hash($mp_hash,'point')

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

@ -35,7 +35,7 @@ $db_name = pick($nova_hash['db_name'], 'nova')
$db_password = pick($nova_hash['db_password'], 'nova')
$database_connection = "mysql://${db_name}:${db_password}@${db_host}/${db_name}?read_timeout=60"
$memcache_nodes = get_nodes_hash_by_roles(hiera('network_metadata'), hiera('memcache_roles'))
$memcache_nodes = get_nodes_hash_by_roles(hiera_hash('network_metadata'), hiera('memcache_roles'))
$cache_server_ip = ipsort(values(get_node_to_ipaddr_map_by_network_role($memcache_nodes,'mgmt/memcache')))
$memcached_addresses = suffix($cache_server_ip, inline_template(":<%= @cache_server_port %>"))
$notify_on_state_change = 'vm_and_task_state'

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

@ -2,7 +2,7 @@ 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_nodes = get_nodes_hash_by_roles(hiera_hash('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)

4
tests/noop/astute.yaml/override/ceilometer-controller.yaml Normal file
View File

@ -0,0 +1,4 @@
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/horizon-horizon.yaml Normal file
View File

@ -0,0 +1,4 @@
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/keystone-keystone.yaml
View File

@ -11,3 +11,7 @@ configuration:
value: keystone.contrib.ec2.backends.kvs.Ec2
policy/driver:
ensure: absent
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/openstack-controller-openstack-controller.yaml
View File

@ -10,3 +10,7 @@ configuration:
nova_paste_api_ini:
DEFAULT/test:
value: True
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/openstack-network-routers.yaml Normal file
View File

@ -0,0 +1,4 @@
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/roles-compute.yaml
View File

@ -10,3 +10,7 @@ configuration:
nova_paste_api_ini:
DEFAULT/test:
value: True
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/roles-ironic-compute.yaml Normal file
View File

@ -0,0 +1,4 @@
network_metadata:
vips:
management:
namespace: 'haproxy'

4
tests/noop/astute.yaml/override/roles-mongo.yaml Normal file
View File

@ -0,0 +1,4 @@
network_metadata:
vips:
management:
namespace: 'haproxy'

2
tests/noop/spec/hosts/roles/compute_spec.rb
View File

@ -187,7 +187,7 @@ describe manifest do
# Check out nova config params
it 'should properly configure nova' do
node_name = Noop.hiera('node_name')
network_metadata = Noop.hiera_structure('network_metadata')
network_metadata = Noop.hiera_hash('network_metadata')
roles = network_metadata['nodes'][node_name]['node_roles']
nova_hash.merge!({'vncproxy_protocol' => vncproxy_protocol})