openstack
/
fuel-library
Code Issues Proposed changes

Fix mysql hash lookup for deep hash merge 

hiera_hash('mysql_hash') only pulls in the
mysql_hash from globals.yaml, ignoring the
'mysql' hash that exists in plugins.

This is part of a fix that will align all hash
storage and lookups to not contain '_hash' suffix.

Change-Id: Id74f6b31107f8939f185b3832c897d3dff7197f9
Partial-Bug: #1526917
(cherry picked from commit d73af357ce)
(cherry picked from commit d008eaf5de)
This commit is contained in:
Matthew Mosesohn 2016-02-05 18:55:55 +04:00
parent 46e581f5d8
commit 207a762adf
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,7 +1,7 @@
notice('MODULAR: cinder/db.pp')
$cinder_hash = hiera_hash('cinder', {})
$mysql_hash = hiera_hash('mysql_hash', {})
$mysql_hash = hiera_hash('mysql', {})
$management_vip = hiera('management_vip', undef)
$database_vip = hiera('database_vip', undef)

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

@ -16,7 +16,7 @@ $nodes_hash = hiera('nodes', {})
$storage_hash = hiera_hash('storage_hash', {})
$vcenter_hash = hiera('vcenter', {})
$nova_hash = hiera_hash('nova_hash', {})
$mysql_hash = hiera_hash('mysql_hash', {})
$mysql_hash = hiera_hash('mysql', {})
$rabbit_hash = hiera_hash('rabbit_hash', {})
$glance_hash = hiera_hash('glance_hash', {})
$keystone_hash = hiera_hash('keystone_hash', {})

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

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