aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/objectstorage-role.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-03-01 09:51:20 +0000
committerSteven Hardy <shardy@redhat.com>2017-03-03 16:14:17 +0000
commitff48624d03b48dc904bfae368f4be057c5dd2148 (patch)
tree6d77341441cc10adf29663c2979d0744b32a534f /puppet/objectstorage-role.yaml
parent9c27e4986ccea607d6dc9dbd4c79297d4ca79fed (diff)
Make UpdateDeployment depend on NetworkDeployment
Prior to https://review.openstack.org/#/c/271450/ os-net-config was applied via os-refresh-config directly, which meant that even though UpdateDeployment and NetworkDeployment can be created concurrently, we'd always do the os-net-config step first. However now that we apply both steps via scripts (which are both handled via the same heat-config hook) we should add an explicit dependency to ensure the network is always fully configured before attempting to run any update. This should avoid the risk of e.g running an update on initial deployment before the network connectivity to access yum repos is in place. Change-Id: Idff7a95afe7b49b6384b1d0c78e76522fb1f8eb7 Related-Bug: #1666227 (cherry picked from commit 626b820b57498ff5002c5530962e6e4fd5644b51)
Diffstat (limited to 'puppet/objectstorage-role.yaml')
-rw-r--r--puppet/objectstorage-role.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml
index 172484dc..6ee06d78 100644
--- a/puppet/objectstorage-role.yaml
+++ b/puppet/objectstorage-role.yaml
@@ -447,6 +447,7 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
+ depends_on: NetworkDeployment
properties:
config: {get_resource: UpdateConfig}
server: {get_resource: SwiftStorage}