Add CephStorageExtraConfigPre resource

This change adds a CephStorageExtraConfigPre which can be used
to distribute hooks for the CephStorage nodes.

Change-Id: Id0023d8ffddb3ee5e855d5dcc32c76bc41ce4c63

diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index c5e5fde..b527c10 100644 (file)
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -34,6 +34,7 @@ resource_registry:
   OS::TripleO::NodeUserData: firstboot/userdata_default.yaml
   OS::TripleO::ControllerExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
   OS::TripleO::ComputeExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
+  OS::TripleO::CephStorageExtraConfigPre: puppet/extraconfig/pre_deploy/default.yaml
   OS::TripleO::NodeExtraConfigPost: extraconfig/post_deploy/default.yaml
 
   # "AllNodes" Extra cluster config, runs on all nodes prior to the post_deploy

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index f1a7e62..8795705 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -172,6 +172,13 @@ resources:
                 ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
                 ceph::profile::params::public_network: {get_input: ceph_public_network}
 
+  # Hook for site-specific additional pre-deployment config, e.g extra hieradata
+  CephStorageExtraConfigPre:
+    depends_on: CephStorageDeployment
+    type: OS::TripleO::CephStorageExtraConfigPre
+    properties:
+        server: {get_resource: CephStorage}
+
   UpdateConfig:
     type: OS::TripleO::Tasks::PackageUpdate
 
@@ -204,4 +211,8 @@ outputs:
     value: {get_attr: [StorageMgmtPort, ip_address]}
   config_identifier:
     description: identifier which changes if the node configuration may need re-applying
-    value: {get_attr: [CephStorageDeployment, deploy_stdout]}
+    value:
+      list_join:
+      - ','
+      - - {get_attr: [CephStorageDeployment, deploy_stdout]}
+        - {get_attr: [CephStorageExtraConfigPre, deploy_stdout]}