Fix for MOS 9.0 deployment with changed host names

Closes-Bug: #1633701
Change-Id: Ic6b6f3baaf271fa77981c9185ea9c2f16437c66d
This commit is contained in:
Olivier Bourdon 2016-08-19 15:11:09 +02:00
parent 646dc92052
commit d6f934207e
1 changed files with 4 additions and 2 deletions

View File

@ -19,7 +19,9 @@ $primary_controller_nodes = get_nodes_hash_by_roles($network_metadata, ['pr
$controllers = get_nodes_hash_by_roles($network_metadata, ['primary-controller', 'controller'])
$controller_internal_addresses = get_node_to_ipaddr_map_by_network_role($controllers, 'management')
$controller_nodes = ipsort(values($controller_internal_addresses))
$hostinfo = $network_metadata['nodes'][$::hostname]
$uid = hiera('uid')
$node_hostname = "node-${uid}"
$hostinfo = $network_metadata['nodes'][$node_hostname]
$netinfo = $hostinfo['network_roles']
$internal_address = $netinfo['management']
$public_address = $netinfo['ex']
@ -36,7 +38,7 @@ if $fuel_version < 8.0 {
$is_base_os = roles_include(['base-os'])
$is_virt = roles_include(['virt'])
$is_controller = roles_include(['controller', 'primary-controller'])
$roles_nb = size($network_metadata['nodes'][$::hostname]['node_roles'])
$roles_nb = size($network_metadata['nodes'][$node_hostname]['node_roles'])
}
class { 'plugin_zabbix::monitoring':