Merge "Allow customization of the Ceph pool names"

[apex-tripleo-heat-templates.git] / puppet / ceph-storage.yaml

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index f1a7e62..7529459 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -139,6 +139,7 @@ resources:
             params:
               server: {get_param: NtpServer}
         enable_package_install: {get_param: EnablePackageInstall}
+        enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
         ceph_cluster_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
         ceph_public_network: {get_attr: [NetIpSubnetMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
 
@@ -169,9 +170,25 @@ resources:
               mapped_data:
                 ntp::servers: {get_input: ntp_servers}
                 tripleo::packages::enable_install: {get_input: enable_package_install}
+                tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
                 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}
+
+  # Hook for site-specific additional pre-deployment config,
+  # applying to all nodes, e.g node registration/unregistration
+  NodeExtraConfig:
+    depends_on: CephStorageExtraConfigPre
+    type: OS::TripleO::NodeExtraConfig
+    properties:
+        server: {get_resource: CephStorage}
+
   UpdateConfig:
     type: OS::TripleO::Tasks::PackageUpdate
 
@@ -204,4 +221,9 @@ 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]}
+        - {get_param: UpdateIdentifier}