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
tags/7.0.0.0b1
Steven Hardy 2 years ago
parent
commit
626b820b57

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

@@ -448,6 +448,7 @@ resources:
448 448
 
449 449
   UpdateDeployment:
450 450
     type: OS::Heat::SoftwareDeployment
451
+    depends_on: NetworkDeployment
451 452
     properties:
452 453
       name: UpdateDeployment
453 454
       config: {get_resource: UpdateConfig}

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

@@ -460,6 +460,7 @@ resources:
460 460
 
461 461
   UpdateDeployment:
462 462
     type: OS::Heat::SoftwareDeployment
463
+    depends_on: NetworkDeployment
463 464
     properties:
464 465
       config: {get_resource: UpdateConfig}
465 466
       server: {get_resource: CephStorage}

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

@@ -483,6 +483,7 @@ resources:
483 483
 
484 484
   UpdateDeployment:
485 485
     type: OS::Heat::SoftwareDeployment
486
+    depends_on: NetworkDeployment
486 487
     properties:
487 488
       name: UpdateDeployment
488 489
       config: {get_resource: UpdateConfig}

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

@@ -523,6 +523,7 @@ resources:
523 523
 
524 524
   UpdateDeployment:
525 525
     type: OS::Heat::SoftwareDeployment
526
+    depends_on: NetworkDeployment
526 527
     properties:
527 528
       name: UpdateDeployment
528 529
       config: {get_resource: UpdateConfig}

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

@@ -447,6 +447,7 @@ resources:
447 447
 
448 448
   UpdateDeployment:
449 449
     type: OS::Heat::SoftwareDeployment
450
+    depends_on: NetworkDeployment
450 451
     properties:
451 452
       config: {get_resource: UpdateConfig}
452 453
       server: {get_resource: SwiftStorage}

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

@@ -481,6 +481,7 @@ resources:
481 481
 
482 482
   UpdateDeployment:
483 483
     type: OS::Heat::SoftwareDeployment
484
+    depends_on: NetworkDeployment
484 485
     properties:
485 486
       config: {get_resource: UpdateConfig}
486 487
       server: {get_resource: {{role}}}

Loading…
Cancel
Save