X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fblockstorage-role.yaml;h=e92de45f7cc31434bd86d04ec7547436de470d6d;hb=ca843e18824f8ff5bfe2f576ad2afb894a16d2f4;hp=e74beb2d4a8250c445e951c1a6ef087b32b05c35;hpb=4c25c57c497430c5b4fd740669c8e51bbe81092a;p=apex-tripleo-heat-templates.git

diff --git a/puppet/blockstorage-role.yaml b/puppet/blockstorage-role.yaml
index e74beb2d..e92de45f 100644
--- a/puppet/blockstorage-role.yaml
+++ b/puppet/blockstorage-role.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 description: 'OpenStack cinder storage configured by Puppet'
 parameters:
   BlockStorageImage:
@@ -336,8 +336,14 @@ resources:
             - - {get_attr: [BlockStorage, name]}
               - ctlplane
 
+  PreNetworkConfig:
+    type: OS::TripleO::BlockStorage::PreNetworkConfig
+    properties:
+      server: {get_resource: BlockStorage}
+
   NetworkDeployment:
     type: OS::TripleO::SoftwareDeployment
+    depends_on: PreNetworkConfig
     properties:
       name: NetworkDeployment
       config: {get_resource: NetworkConfig}