From 4570ce86a9fbbfa10c664ea3afd2574fdd4a4202 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yguenane@redhat.com>
Date: Thu, 20 Aug 2015 10:24:57 +0200
Subject: [PATCH] Allow a user to set specific setting per host

It is currently not possible to specify settings per host and not per
type of host.

One of the example of the problematic that could cause is : What if
node0 have devices /dev/sdb and /dev/sdc while node1 have devices
/dev/sda and /dev/sdd, they is currently no way to specify that simply.

The idea here is to add a top priority file in the hiera lookup that
will match the UUID of the System Information section in the output of
the dmidecode command.

The file could be provided with the firstboot/rsync stack for example.

Change-Id: I3ab082c8ebd2567bd1d914fc0b924e19b1eff7d0
---
 puppet/ceph-storage.yaml   | 1 +
 puppet/cinder-storage.yaml | 1 +
 puppet/compute.yaml        | 1 +
 puppet/controller.yaml     | 1 +
 puppet/swift-storage.yaml  | 1 +
 5 files changed, 5 insertions(+)

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 4b4c76fc8d..f1a7e62915 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -149,6 +149,7 @@ resources:
       config:
         hiera:
           hierarchy:
+            - '"%{::uuid}"'
             - heat_config_%{::deploy_config_name}
             - ceph_extraconfig
             - extraconfig
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index f597512a50..1cc300cc68 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -226,6 +226,7 @@ resources:
       config:
         hiera:
           hierarchy:
+            - '"%{::uuid}"'
             - heat_config_%{::deploy_config_name}
             - volume_extraconfig
             - extraconfig
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 3f7309940a..54a3b69dd9 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -333,6 +333,7 @@ resources:
       config:
         hiera:
           hierarchy:
+            - '"%{::uuid}"'
             - heat_config_%{::deploy_config_name}
             - compute_extraconfig
             - extraconfig
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 084fe3d133..548d79d93d 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -896,6 +896,7 @@ resources:
       config:
         hiera:
           hierarchy:
+            - '"%{::uuid}"'
             - heat_config_%{::deploy_config_name}
             - controller_extraconfig
             - extraconfig
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 676177713d..c09b4e45dc 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -156,6 +156,7 @@ resources:
       config:
         hiera:
           hierarchy:
+            - '"%{::uuid}"'
             - heat_config_%{::deploy_config_name}
             - object_extraconfig
             - extraconfig