Merge "Remove CeilometerStoreEvents parameter"

[apex-tripleo-heat-templates.git] / puppet / cephstorage-role.yaml

diff --git a/puppet/cephstorage-role.yaml b/puppet/cephstorage-role.yaml
index 75f5801..892f91e 100644 (file)
--- a/puppet/cephstorage-role.yaml
+++ b/puppet/cephstorage-role.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 description: 'OpenStack ceph storage node configured by Puppet'
 parameters:
   OvercloudCephStorageFlavor:
@@ -342,8 +342,14 @@ resources:
             - - {get_attr: [CephStorage, name]}
               - ctlplane
 
+  PreNetworkConfig:
+    type: OS::TripleO::CephStorage::PreNetworkConfig
+    properties:
+      server: {get_resource: CephStorage}
+
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
+    depends_on: PreNetworkConfig
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}