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 commit626b820b57
) (cherry picked from commitff48624d03
)
This commit is contained in:
parent
f2f3bce268
commit
b7db8e8532
@ -293,6 +293,7 @@ resources:
|
|||||||
|
|
||||||
UpdateDeployment:
|
UpdateDeployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
depends_on: NetworkDeployment
|
||||||
properties:
|
properties:
|
||||||
name: UpdateDeployment
|
name: UpdateDeployment
|
||||||
config: {get_resource: UpdateConfig}
|
config: {get_resource: UpdateConfig}
|
||||||
|
@ -305,6 +305,7 @@ resources:
|
|||||||
|
|
||||||
UpdateDeployment:
|
UpdateDeployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
depends_on: NetworkDeployment
|
||||||
properties:
|
properties:
|
||||||
config: {get_resource: UpdateConfig}
|
config: {get_resource: UpdateConfig}
|
||||||
server: {get_resource: CephStorage}
|
server: {get_resource: CephStorage}
|
||||||
|
@ -328,6 +328,7 @@ resources:
|
|||||||
|
|
||||||
UpdateDeployment:
|
UpdateDeployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
depends_on: NetworkDeployment
|
||||||
properties:
|
properties:
|
||||||
name: UpdateDeployment
|
name: UpdateDeployment
|
||||||
config: {get_resource: UpdateConfig}
|
config: {get_resource: UpdateConfig}
|
||||||
|
@ -371,6 +371,7 @@ resources:
|
|||||||
|
|
||||||
UpdateDeployment:
|
UpdateDeployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
depends_on: NetworkDeployment
|
||||||
properties:
|
properties:
|
||||||
name: UpdateDeployment
|
name: UpdateDeployment
|
||||||
config: {get_resource: UpdateConfig}
|
config: {get_resource: UpdateConfig}
|
||||||
|
@ -293,6 +293,7 @@ resources:
|
|||||||
|
|
||||||
UpdateDeployment:
|
UpdateDeployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
depends_on: NetworkDeployment
|
||||||
properties:
|
properties:
|
||||||
config: {get_resource: UpdateConfig}
|
config: {get_resource: UpdateConfig}
|
||||||
server: {get_resource: SwiftStorage}
|
server: {get_resource: SwiftStorage}
|
||||||
|
@ -320,6 +320,7 @@ resources:
|
|||||||
|
|
||||||
UpdateDeployment:
|
UpdateDeployment:
|
||||||
type: OS::Heat::SoftwareDeployment
|
type: OS::Heat::SoftwareDeployment
|
||||||
|
depends_on: NetworkDeployment
|
||||||
properties:
|
properties:
|
||||||
config: {get_resource: UpdateConfig}
|
config: {get_resource: UpdateConfig}
|
||||||
server: {get_resource: {{role}}}
|
server: {get_resource: {{role}}}
|
||||||
|
Loading…
Reference in New Issue
Block a user