Adapt Murano to flexible networking
- Use appropriate network roles - Clean up not needed part Change-Id: I78a52ee675cc10330927d25a0d8a3188522ab367 Implements: blueprint templates-for-networking
This commit is contained in:
parent
c174f646b4
commit
3b6ae9ebef
|
@ -273,6 +273,9 @@ $swift_proxies = get_nodes_hash_by_roles($network_metadata, ['primary-cont
|
||||||
$swift_proxy_caches = get_nodes_hash_by_roles($network_metadata, ['primary-controller', 'controller']) # memcache for swift
|
$swift_proxy_caches = get_nodes_hash_by_roles($network_metadata, ['primary-controller', 'controller']) # memcache for swift
|
||||||
$is_primary_swift_proxy = $primary_controller
|
$is_primary_swift_proxy = $primary_controller
|
||||||
|
|
||||||
|
# Define murano-related variables
|
||||||
|
$murano_roles = ['primary-controller', 'controller']
|
||||||
|
|
||||||
# Define heat-related variables:
|
# Define heat-related variables:
|
||||||
$heat_roles = ['primary-controller', 'controller']
|
$heat_roles = ['primary-controller', 'controller']
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
notice('MODULAR: murano/db.pp')
|
notice('MODULAR: murano/db.pp')
|
||||||
|
|
||||||
|
$node_name = hiera('node_name')
|
||||||
$murano_hash = hiera_hash('murano_hash', {})
|
$murano_hash = hiera_hash('murano_hash', {})
|
||||||
$murano_enabled = pick($murano_hash['enabled'], false)
|
$murano_enabled = pick($murano_hash['enabled'], false)
|
||||||
$mysql_hash = hiera_hash('mysql_hash', {})
|
$mysql_hash = hiera_hash('mysql_hash', {})
|
||||||
|
@ -14,12 +15,12 @@ $db_user = pick($murano_hash['db_user'], 'murano')
|
||||||
$db_name = pick($murano_hash['db_name'], 'murano')
|
$db_name = pick($murano_hash['db_name'], 'murano')
|
||||||
$db_password = pick($murano_hash['db_password'], $mysql_root_password)
|
$db_password = pick($murano_hash['db_password'], $mysql_root_password)
|
||||||
|
|
||||||
$db_host = pick($murano_hash['db_host'], $database_vip, $management_vip, 'localhost')
|
$db_host = pick($murano_hash['db_host'], $database_vip, 'localhost')
|
||||||
$db_create = pick($murano_hash['db_create'], $mysql_db_create)
|
$db_create = pick($murano_hash['db_create'], $mysql_db_create)
|
||||||
$db_root_user = pick($murano_hash['root_user'], $mysql_root_user)
|
$db_root_user = pick($murano_hash['root_user'], $mysql_root_user)
|
||||||
$db_root_password = pick($murano_hash['root_password'], $mysql_root_password)
|
$db_root_password = pick($murano_hash['root_password'], $mysql_root_password)
|
||||||
|
|
||||||
$allowed_hosts = [ $::hostname, 'localhost', '127.0.0.1', '%' ]
|
$allowed_hosts = [ $node_name, 'localhost', '127.0.0.1', '%' ]
|
||||||
|
|
||||||
validate_string($mysql_root_user)
|
validate_string($mysql_root_user)
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
notice('MODULAR: murano.pp')
|
notice('MODULAR: murano.pp')
|
||||||
|
|
||||||
|
prepare_network_config(hiera('network_scheme', {}))
|
||||||
|
|
||||||
$murano_hash = hiera_hash('murano_hash', {})
|
$murano_hash = hiera_hash('murano_hash', {})
|
||||||
$murano_settings_hash = hiera_hash('murano_settings', {})
|
$murano_settings_hash = hiera_hash('murano_settings', {})
|
||||||
$rabbit_hash = hiera_hash('rabbit_hash', {})
|
$rabbit_hash = hiera_hash('rabbit_hash', {})
|
||||||
|
@ -7,11 +9,11 @@ $heat_hash = hiera_hash('heat_hash', {})
|
||||||
$neutron_config = hiera_hash('neutron_config', {})
|
$neutron_config = hiera_hash('neutron_config', {})
|
||||||
$node_role = hiera('node_role')
|
$node_role = hiera('node_role')
|
||||||
$public_ip = hiera('public_vip')
|
$public_ip = hiera('public_vip')
|
||||||
|
$database_ip = hiera('database_vip', undef)
|
||||||
$management_ip = hiera('management_vip')
|
$management_ip = hiera('management_vip')
|
||||||
$internal_address = hiera('internal_address')
|
|
||||||
$region = hiera('region', 'RegionOne')
|
$region = hiera('region', 'RegionOne')
|
||||||
$use_neutron = hiera('use_neutron', false)
|
$use_neutron = hiera('use_neutron', false)
|
||||||
$service_endpoint = hiera('service_endpoint', $management_ip)
|
$service_endpoint = hiera('service_endpoint')
|
||||||
$syslog_log_facility_murano = hiera('syslog_log_facility_murano')
|
$syslog_log_facility_murano = hiera('syslog_log_facility_murano')
|
||||||
$debug = hiera('debug', false)
|
$debug = hiera('debug', false)
|
||||||
$verbose = hiera('verbose', true)
|
$verbose = hiera('verbose', true)
|
||||||
|
@ -36,7 +38,7 @@ $public_address = pick($public_ssl['services'], false) ? {
|
||||||
$firewall_rule = '202 murano-api'
|
$firewall_rule = '202 murano-api'
|
||||||
|
|
||||||
$api_bind_port = '8082'
|
$api_bind_port = '8082'
|
||||||
$api_bind_host = $internal_address
|
$api_bind_host = get_network_role_property('murano/api', 'ipaddr')
|
||||||
|
|
||||||
$murano_user = pick($murano_hash['user'], 'murano')
|
$murano_user = pick($murano_hash['user'], 'murano')
|
||||||
$tenant = pick($murano_hash['tenant'], 'services')
|
$tenant = pick($murano_hash['tenant'], 'services')
|
||||||
|
@ -44,7 +46,7 @@ $internal_url = "http://${service_endpoint}:${api_bind_port}"
|
||||||
$db_user = pick($murano_hash['db_user'], 'murano')
|
$db_user = pick($murano_hash['db_user'], 'murano')
|
||||||
$db_name = pick($murano_hash['db_name'], 'murano')
|
$db_name = pick($murano_hash['db_name'], 'murano')
|
||||||
$db_password = pick($murano_hash['db_password'])
|
$db_password = pick($murano_hash['db_password'])
|
||||||
$db_host = pick($murano_hash['db_host'], $management_ip)
|
$db_host = pick($murano_hash['db_host'], $database_ip)
|
||||||
$read_timeout = '60'
|
$read_timeout = '60'
|
||||||
$sql_connection = "mysql://${db_user}:${db_password}@${db_host}/${db_name}?read_timeout=${read_timeout}"
|
$sql_connection = "mysql://${db_user}:${db_password}@${db_host}/${db_name}?read_timeout=${read_timeout}"
|
||||||
|
|
||||||
|
|
|
@ -1,19 +1,15 @@
|
||||||
notice('MODULAR: openstack-haproxy-murano.pp')
|
notice('MODULAR: openstack-haproxy-murano.pp')
|
||||||
|
|
||||||
$murano_hash = hiera_hash('murano',{})
|
$murano_hash = hiera_hash('murano_hash',{})
|
||||||
# NOT enabled by default
|
# NOT enabled by default
|
||||||
$use_murano = pick($murano_hash['enabled'], false)
|
$use_murano = pick($murano_hash['enabled'], false)
|
||||||
$public_ssl_hash = hiera('public_ssl')
|
$public_ssl_hash = hiera('public_ssl')
|
||||||
|
$network_metadata = hiera_hash('network_metadata')
|
||||||
$controllers = hiera('controllers')
|
$murano_address_map = get_node_to_ipaddr_map_by_network_role(get_nodes_hash_by_roles($network_metadata, hiera('murano_roles')), 'murano/api')
|
||||||
$controllers_server_names = filter_hash($controllers, 'name')
|
|
||||||
$controllers_ipaddresses = filter_hash($controllers, 'internal_address')
|
|
||||||
|
|
||||||
if ($use_murano) {
|
if ($use_murano) {
|
||||||
$server_names = pick(hiera_array('murano_names', undef),
|
$server_names = hiera_array('murano_names',keys($murano_address_map))
|
||||||
$controllers_server_names)
|
$ipaddresses = hiera_array('murano_ipaddresses', values($murano_address_map))
|
||||||
$ipaddresses = pick(hiera_array('murano_ipaddresses', undef),
|
|
||||||
$controllers_ipaddresses)
|
|
||||||
$public_virtual_ip = hiera('public_vip')
|
$public_virtual_ip = hiera('public_vip')
|
||||||
$internal_virtual_ip = hiera('management_vip')
|
$internal_virtual_ip = hiera('management_vip')
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
<% globals.store "mongo_nodes", @mongo_nodes -%>
|
<% globals.store "mongo_nodes", @mongo_nodes -%>
|
||||||
<% globals.store "multi_host", @multi_host -%>
|
<% globals.store "multi_host", @multi_host -%>
|
||||||
<% globals.store "murano_hash", @murano_hash -%>
|
<% globals.store "murano_hash", @murano_hash -%>
|
||||||
|
<% globals.store "murano_roles", @murano_roles -%>
|
||||||
<% globals.store "mysql_hash", @mysql_hash -%>
|
<% globals.store "mysql_hash", @mysql_hash -%>
|
||||||
<% globals.store "network_config", @network_config -%>
|
<% globals.store "network_config", @network_config -%>
|
||||||
<% globals.store "network_manager", @network_manager -%>
|
<% globals.store "network_manager", @network_manager -%>
|
||||||
|
|
Loading…
Reference in New Issue