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

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 4b4c76f..f1a7e62 100644 (file)
--- 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 f597512..1cc300c 100644 (file)
--- 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 3f73099..54a3b69 100644 (file)
--- 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 084fe3d..548d79d 100644 (file)
--- 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 6761777..c09b4e4 100644 (file)
--- 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