openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use Deployment actions for blacklist"

This commit is contained in:
Jenkins 2017-06-08 19:53:26 +00:00 committed by Gerrit Code Review
parent 2a0261768a d48299cb50
commit d21ef0d91c
6 changed files with 121 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
puppet/blockstorage-role.yaml
View File

@ -376,12 +376,15 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
depends_on: PreNetworkConfig
condition: server_not_blacklisted
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
server: {get_resource: BlockStorage}
actions: {get_param: NetworkDeploymentActions}
actions:
if:
- server_not_blacklisted
- {get_param: NetworkDeploymentActions}
- []
BlockStorageUpgradeInitConfig:
type: OS::Heat::SoftwareConfig
@ -400,22 +403,30 @@ resources:
BlockStorageUpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: BlockStorageUpgradeInitDeployment
server: {get_resource: BlockStorage}
config: {get_resource: BlockStorageUpgradeInitConfig}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
BlockStorageDeployment:
type: OS::Heat::StructuredDeployment
depends_on: BlockStorageUpgradeInitDeployment
condition: server_not_blacklisted
properties:
name: BlockStorageDeployment
server: {get_resource: BlockStorage}
config: {get_resource: BlockStorageConfig}
input_values:
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
# Map heat metadata into hiera datafiles
BlockStorageConfig:
@ -477,7 +488,6 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: UpdateDeployment
config: {get_resource: UpdateConfig}
@ -485,6 +495,11 @@ resources:
input_values:
update_identifier:
get_param: UpdateIdentifier
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey

25
puppet/cephstorage-role.yaml
View File

@ -382,12 +382,15 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
depends_on: PreNetworkConfig
condition: server_not_blacklisted
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
server: {get_resource: CephStorage}
actions: {get_param: NetworkDeploymentActions}
actions:
if:
- server_not_blacklisted
- {get_param: NetworkDeploymentActions}
- []
CephStorageUpgradeInitConfig:
type: OS::Heat::SoftwareConfig
@ -406,22 +409,30 @@ resources:
CephStorageUpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: CephStorageUpgradeInitDeployment
server: {get_resource: CephStorage}
config: {get_resource: CephStorageUpgradeInitConfig}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
CephStorageDeployment:
type: OS::Heat::StructuredDeployment
depends_on: CephStorageUpgradeInitDeployment
condition: server_not_blacklisted
properties:
name: CephStorageDeployment
config: {get_resource: CephStorageConfig}
server: {get_resource: CephStorage}
input_values:
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
CephStorageConfig:
type: OS::Heat::StructuredConfig
@ -489,13 +500,17 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
config: {get_resource: UpdateConfig}
server: {get_resource: CephStorage}
input_values:
update_identifier:
get_param: UpdateIdentifier
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey

25
puppet/compute-role.yaml
View File

@ -396,12 +396,15 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
depends_on: PreNetworkConfig
condition: server_not_blacklisted
properties:
name: NetworkDeployment
actions:
if:
- server_not_blacklisted
- {get_param: NetworkDeploymentActions}
- []
config: {get_resource: NetworkConfig}
server: {get_resource: NovaCompute}
actions: {get_param: NetworkDeploymentActions}
input_values:
bridge_name: {get_param: NeutronPhysicalBridge}
interface_name: {get_param: NeutronPublicInterface}
@ -423,9 +426,13 @@ resources:
NovaComputeUpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: NovaComputeUpgradeInitDeployment
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
server: {get_resource: NovaCompute}
config: {get_resource: NovaComputeUpgradeInitConfig}
@ -476,9 +483,13 @@ resources:
NovaComputeDeployment:
type: OS::TripleO::SoftwareDeployment
depends_on: NovaComputeUpgradeInitDeployment
condition: server_not_blacklisted
properties:
name: NovaComputeDeployment
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
config: {get_resource: NovaComputeConfig}
server: {get_resource: NovaCompute}
input_values:
@ -512,9 +523,13 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: UpdateDeployment
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
config: {get_resource: UpdateConfig}
server: {get_resource: NovaCompute}
input_values:

25
puppet/controller-role.yaml
View File

@ -415,13 +415,16 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
condition: server_not_blacklisted
depends_on: PreNetworkConfig
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
server: {get_resource: Controller}
actions: {get_param: NetworkDeploymentActions}
actions:
if:
- server_not_blacklisted
- {get_param: NetworkDeploymentActions}
- []
input_values:
bridge_name: br-ex
interface_name: {get_param: NeutronPublicInterface}
@ -457,19 +460,27 @@ resources:
# but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first
ControllerUpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment
condition: server_not_blacklisted
depends_on: NetworkDeployment
properties:
name: ControllerUpgradeInitDeployment
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
server: {get_resource: Controller}
config: {get_resource: ControllerUpgradeInitConfig}
ControllerDeployment:
type: OS::TripleO::SoftwareDeployment
condition: server_not_blacklisted
depends_on: ControllerUpgradeInitDeployment
properties:
name: ControllerDeployment
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
config: {get_resource: ControllerConfig}
server: {get_resource: Controller}
input_values:
@ -551,10 +562,14 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
condition: server_not_blacklisted
depends_on: NetworkDeployment
properties:
name: UpdateDeployment
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
config: {get_resource: UpdateConfig}
server: {get_resource: Controller}
input_values:

26
puppet/objectstorage-role.yaml
View File

@ -376,12 +376,16 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
depends_on: PreNetworkConfig
condition: server_not_blacklisted
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
server: {get_resource: SwiftStorage}
actions: {get_param: NetworkDeploymentActions}
actions:
if:
- server_not_blacklisted
- {get_param: NetworkDeploymentActions}
- []
SwiftStorageUpgradeInitConfig:
type: OS::Heat::SoftwareConfig
@ -400,11 +404,15 @@ resources:
SwiftStorageUpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: SwiftStorageUpgradeInitDeployment
server: {get_resource: SwiftStorage}
config: {get_resource: SwiftStorageUpgradeInitConfig}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SwiftStorageHieraConfig:
type: OS::Heat::StructuredConfig
@ -447,13 +455,17 @@ resources:
SwiftStorageHieraDeploy:
type: OS::Heat::StructuredDeployment
depends_on: SwiftStorageUpgradeInitDeployment
condition: server_not_blacklisted
properties:
name: SwiftStorageHieraDeploy
server: {get_resource: SwiftStorage}
config: {get_resource: SwiftStorageHieraConfig}
input_values:
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
# Resource for site-specific injection of root certificate
NodeTLSCAData:
@ -476,13 +488,17 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
config: {get_resource: UpdateConfig}
server: {get_resource: SwiftStorage}
input_values:
update_identifier:
get_param: UpdateIdentifier
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey

24
puppet/role.role.j2.yaml
View File

@ -398,7 +398,6 @@ resources:
NetworkDeployment:
type: OS::TripleO::SoftwareDeployment
depends_on: PreNetworkConfig
condition: server_not_blacklisted
properties:
name: NetworkDeployment
config: {get_resource: NetworkConfig}
@ -407,6 +406,11 @@ resources:
input_values:
bridge_name: br-ex
interface_name: {get_param: NeutronPublicInterface}
actions:
if:
- server_not_blacklisted
- {get_param: NetworkDeploymentActions}
- []
{{role}}UpgradeInitConfig:
type: OS::Heat::SoftwareConfig
@ -425,22 +429,30 @@ resources:
{{role}}UpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: {{role}}UpgradeInitDeployment
server: {get_resource: {{role}}}
config: {get_resource: {{role}}UpgradeInitConfig}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
{{role}}Deployment:
type: OS::Heat::StructuredDeployment
depends_on: {{role}}UpgradeInitDeployment
condition: server_not_blacklisted
properties:
name: {{role}}Deployment
config: {get_resource: {{role}}Config}
server: {get_resource: {{role}}}
input_values:
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
{{role}}Config:
type: OS::Heat::StructuredConfig
@ -510,7 +522,6 @@ resources:
UpdateDeployment:
type: OS::Heat::SoftwareDeployment
depends_on: NetworkDeployment
condition: server_not_blacklisted
properties:
name: UpdateDeployment
config: {get_resource: UpdateConfig}
@ -518,6 +529,11 @@ resources:
input_values:
update_identifier:
get_param: UpdateIdentifier
actions:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey