From 6323aa38c9e93a5fd2e0d6d83fb823500d47f7be Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Wed, 6 Feb 2019 12:22:04 +0100
Subject: [PATCH] Adding dependency for NetworkDeployment in
 'server_resource_name'Deployment

We removed the dependency for NetworkDeployment[1] in
role.role.j2.yaml after moving to Ansible the
UpgradeInitCommand and UpgradeInitCommonCommand Heat hooks.

[1]: https://review.openstack.org/#/c/632108/17/puppet/role.role.j2.yaml@649

Closes-bug: 1812659
Change-Id: I2dae3358b56946aaae7eddbf3eb501e672455565
(cherry picked from commit aa2dc674fb3abdf4d5d2f1d41cc964cc32137b3c)
(cherry picked from commit 5a4431d0a044074614a3f313c3f54b371103a59f)
---
 puppet/role.role.j2.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 8f8d1a97d7..065b6c3ccf 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -502,6 +502,7 @@ resources:
 
   {{server_resource_name}}Deployment:
     type: OS::Heat::StructuredDeployment
+    depends_on: NetworkDeployment
     properties:
       name: {{server_resource_name}}Deployment
       config: {get_resource: {{server_resource_name}}Config}