Browse Source

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 626b820b57)
(cherry picked from commit ff48624d03)
tags/5.3.5
Steven Hardy 2 years ago
parent
commit
b7db8e8532

+ 1
- 0
puppet/blockstorage-role.yaml View File

@@ -293,6 +293,7 @@ resources:
293 293
 
294 294
   UpdateDeployment:
295 295
     type: OS::Heat::SoftwareDeployment
296
+    depends_on: NetworkDeployment
296 297
     properties:
297 298
       name: UpdateDeployment
298 299
       config: {get_resource: UpdateConfig}

+ 1
- 0
puppet/cephstorage-role.yaml View File

@@ -305,6 +305,7 @@ resources:
305 305
 
306 306
   UpdateDeployment:
307 307
     type: OS::Heat::SoftwareDeployment
308
+    depends_on: NetworkDeployment
308 309
     properties:
309 310
       config: {get_resource: UpdateConfig}
310 311
       server: {get_resource: CephStorage}

+ 1
- 0
puppet/compute-role.yaml View File

@@ -328,6 +328,7 @@ resources:
328 328
 
329 329
   UpdateDeployment:
330 330
     type: OS::Heat::SoftwareDeployment
331
+    depends_on: NetworkDeployment
331 332
     properties:
332 333
       name: UpdateDeployment
333 334
       config: {get_resource: UpdateConfig}

+ 1
- 0
puppet/controller-role.yaml View File

@@ -371,6 +371,7 @@ resources:
371 371
 
372 372
   UpdateDeployment:
373 373
     type: OS::Heat::SoftwareDeployment
374
+    depends_on: NetworkDeployment
374 375
     properties:
375 376
       name: UpdateDeployment
376 377
       config: {get_resource: UpdateConfig}

+ 1
- 0
puppet/objectstorage-role.yaml View File

@@ -293,6 +293,7 @@ resources:
293 293
 
294 294
   UpdateDeployment:
295 295
     type: OS::Heat::SoftwareDeployment
296
+    depends_on: NetworkDeployment
296 297
     properties:
297 298
       config: {get_resource: UpdateConfig}
298 299
       server: {get_resource: SwiftStorage}

+ 1
- 0
puppet/role.role.j2.yaml View File

@@ -320,6 +320,7 @@ resources:
320 320
 
321 321
   UpdateDeployment:
322 322
     type: OS::Heat::SoftwareDeployment
323
+    depends_on: NetworkDeployment
323 324
     properties:
324 325
       config: {get_resource: UpdateConfig}
325 326
       server: {get_resource: {{role}}}

Loading…
Cancel
Save