Merge "Revert "Blacklist support for ExtraConfig""

This commit is contained in:
Jenkins 2017-06-22 21:22:02 +00:00 committed by Gerrit Code Review
commit 7b60e56c0e
11 changed files with 7 additions and 192 deletions

View File

@ -59,19 +59,6 @@ parameters:
description: | description: |
When enabled, the system will perform a yum update after performing the When enabled, the system will perform a yum update after performing the
RHEL Registration process. RHEL Registration process.
deployment_actions:
default: ['CREATE', 'UPDATE']
type: comma_delimited_list
description: >
List of stack actions that will trigger any deployments in this
templates. The actions will be an empty list of the server is in the
toplevel DeploymentServerBlacklist parameter's value.
conditions:
deployment_actions_empty:
equals:
- {get_param: deployment_actions}
- []
resources: resources:
@ -149,11 +136,7 @@ resources:
name: RHELUnregistrationDeployment name: RHELUnregistrationDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: RHELUnregistration} config: {get_resource: RHELUnregistration}
actions: actions: ['DELETE'] # Only do this on DELETE
if:
- deployment_actions_empty
- []
- ['DELETE'] # Only do this on DELETE
input_values: input_values:
REG_METHOD: {get_param: rhel_reg_method} REG_METHOD: {get_param: rhel_reg_method}
@ -186,11 +169,7 @@ resources:
name: UpdateDeploymentAfterRHELRegistration name: UpdateDeploymentAfterRHELRegistration
config: {get_resource: YumUpdateConfigurationAfterRHELRegistration} config: {get_resource: YumUpdateConfigurationAfterRHELRegistration}
server: {get_param: server} server: {get_param: server}
actions: actions: ['CREATE'] # Only do this on CREATE
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
outputs: outputs:
deploy_stdout: deploy_stdout:

View File

@ -7,19 +7,6 @@ description: >
parameters: parameters:
server: server:
type: string type: string
deployment_actions:
default: ['CREATE', 'UPDATE']
type: comma_delimited_list
description: >
List of stack actions that will trigger any deployments in this
templates. The actions will be an empty list of the server is in the
toplevel DeploymentServerBlacklist parameter's value.
conditions:
deployment_actions_empty:
equals:
- {get_param: deployment_actions}
- []
resources: resources:
@ -37,11 +24,6 @@ resources:
name: SomeDeployment name: SomeDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: SomeConfig} config: {get_resource: SomeConfig}
actions:
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
actions: ['CREATE'] # Only do this on CREATE actions: ['CREATE'] # Only do this on CREATE
RebootConfig: RebootConfig:
@ -62,9 +44,5 @@ resources:
name: RebootDeployment name: RebootDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: RebootConfig} config: {get_resource: RebootConfig}
actions: actions: ['CREATE'] # Only do this on CREATE
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL

View File

@ -19,13 +19,6 @@ parameters:
{{role}}HostCpusList: {{role}}HostCpusList:
type: string type: string
default: "" default: ""
deployment_actions:
default: ['CREATE', 'UPDATE']
type: comma_delimited_list
description: >
List of stack actions that will trigger any deployments in this
templates. The actions will be an empty list of the server is in the
toplevel DeploymentServerBlacklist parameter's value.
parameter_group: parameter_group:
- label: deprecated - label: deprecated
@ -45,10 +38,6 @@ conditions:
equals: equals:
- get_param: {{role}}TunedProfileName - get_param: {{role}}TunedProfileName
- "" - ""
deployment_actions_empty:
equals:
- {get_param: deployment_actions}
- []
resources: resources:
@ -73,11 +62,7 @@ resources:
name: HostParametersDeployment name: HostParametersDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: HostParametersConfig} config: {get_resource: HostParametersConfig}
actions: actions: ['CREATE'] # Only do this on CREATE
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
input_values: input_values:
_KERNEL_ARGS_: {get_param: {{role}}KernelArgs} _KERNEL_ARGS_: {get_param: {{role}}KernelArgs}
_TUNED_PROFILE_NAME_: {get_param: {{role}}TunedProfileName} _TUNED_PROFILE_NAME_: {get_param: {{role}}TunedProfileName}
@ -103,11 +88,7 @@ resources:
name: RebootDeployment name: RebootDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: RebootConfig} config: {get_resource: RebootConfig}
actions: actions: ['CREATE'] # Only do this on CREATE
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
outputs: outputs:

View File

@ -11,20 +11,9 @@ parameters:
type: json type: json
description: Role Specific parameters description: Role Specific parameters
default: {} default: {}
deployment_actions:
default: ['CREATE', 'UPDATE']
type: comma_delimited_list
description: >
List of stack actions that will trigger any deployments in this
templates. The actions will be an empty list of the server is in the
toplevel DeploymentServerBlacklist parameter's value.
conditions: conditions:
is_host_config_required: {not: {equals: [{get_param: [RoleParameters, KernelArgs]}, ""]}} is_host_config_required: {not: {equals: [{get_param: [RoleParameters, KernelArgs]}, ""]}}
deployment_actions_empty:
equals:
- {get_param: deployment_actions}
- []
resources: resources:
HostParametersConfig: HostParametersConfig:
@ -48,11 +37,7 @@ resources:
name: HostParametersDeployment name: HostParametersDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: HostParametersConfig} config: {get_resource: HostParametersConfig}
actions: actions: ['CREATE'] # Only do this on CREATE
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
input_values: input_values:
_KERNEL_ARGS_: {get_param: [RoleParameters, KernelArgs]} _KERNEL_ARGS_: {get_param: [RoleParameters, KernelArgs]}
_TUNED_PROFILE_NAME_: {get_param: [RoleParameters, TunedProfileName]} _TUNED_PROFILE_NAME_: {get_param: [RoleParameters, TunedProfileName]}
@ -78,11 +63,7 @@ resources:
name: RebootDeployment name: RebootDeployment
server: {get_param: server} server: {get_param: server}
config: {get_resource: RebootConfig} config: {get_resource: RebootConfig}
actions: actions: ['CREATE'] # Only do this on CREATE
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
signal_transport: NO_SIGNAL signal_transport: NO_SIGNAL
outputs: outputs:

View File

@ -7,13 +7,6 @@ parameters:
server: server:
description: ID of the node to apply this config to description: ID of the node to apply this config to
type: string type: string
deployment_actions:
default: ['CREATE', 'UPDATE']
type: comma_delimited_list
description: >
List of stack actions that will trigger any deployments in this
templates. The actions will be an empty list of the server is in the
toplevel DeploymentServerBlacklist parameter's value.
resources: resources:
SshHostPubKeyConfig: SshHostPubKeyConfig:
@ -35,7 +28,6 @@ resources:
properties: properties:
config: {get_resource: SshHostPubKeyConfig} config: {get_resource: SshHostPubKeyConfig}
server: {get_param: server} server: {get_param: server}
actions: {get_param: deployment_actions}
outputs: outputs:

View File

@ -377,7 +377,6 @@ resources:
properties: properties:
server: {get_resource: BlockStorage} server: {get_resource: BlockStorage}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
@ -486,9 +485,6 @@ resources:
NodeExtraConfig: NodeExtraConfig:
depends_on: NodeTLSCAData depends_on: NodeTLSCAData
type: OS::TripleO::NodeExtraConfig type: OS::TripleO::NodeExtraConfig
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: BlockStorage} server: {get_resource: BlockStorage}
@ -511,21 +507,11 @@ resources:
- ['CREATE', 'UPDATE'] - ['CREATE', 'UPDATE']
- [] - []
DeploymentActions:
type: OS::Heat::Value
properties:
value:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey: SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey type: OS::TripleO::Ssh::HostPubKey
depends_on: BlockStorageDeployment depends_on: BlockStorageDeployment
properties: properties:
server: {get_resource: BlockStorage} server: {get_resource: BlockStorage}
deployment_actions: {get_attr: [DeploymentActions, value]}
outputs: outputs:
ip_address: ip_address:

View File

@ -383,7 +383,6 @@ resources:
properties: properties:
server: {get_resource: CephStorage} server: {get_resource: CephStorage}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
@ -490,9 +489,6 @@ resources:
CephStorageExtraConfigPre: CephStorageExtraConfigPre:
depends_on: CephStorageDeployment depends_on: CephStorageDeployment
type: OS::TripleO::CephStorageExtraConfigPre type: OS::TripleO::CephStorageExtraConfigPre
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: CephStorage} server: {get_resource: CephStorage}
@ -501,9 +497,6 @@ resources:
NodeExtraConfig: NodeExtraConfig:
depends_on: [CephStorageExtraConfigPre, NodeTLSCAData] depends_on: [CephStorageExtraConfigPre, NodeTLSCAData]
type: OS::TripleO::NodeExtraConfig type: OS::TripleO::NodeExtraConfig
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: CephStorage} server: {get_resource: CephStorage}
@ -525,21 +518,11 @@ resources:
- ['CREATE', 'UPDATE'] - ['CREATE', 'UPDATE']
- [] - []
DeploymentActions:
type: OS::Heat::Value
properties:
value:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey: SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey type: OS::TripleO::Ssh::HostPubKey
depends_on: CephStorageDeployment depends_on: CephStorageDeployment
properties: properties:
server: {get_resource: CephStorage} server: {get_resource: CephStorage}
deployment_actions: {get_attr: [DeploymentActions, value]}
outputs: outputs:
ip_address: ip_address:

View File

@ -386,7 +386,6 @@ resources:
properties: properties:
server: {get_resource: NovaCompute} server: {get_resource: NovaCompute}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkConfig: NetworkConfig:
type: OS::TripleO::Compute::Net::SoftwareConfig type: OS::TripleO::Compute::Net::SoftwareConfig
@ -513,9 +512,6 @@ resources:
ComputeExtraConfigPre: ComputeExtraConfigPre:
depends_on: NovaComputeDeployment depends_on: NovaComputeDeployment
type: OS::TripleO::ComputeExtraConfigPre type: OS::TripleO::ComputeExtraConfigPre
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: NovaCompute} server: {get_resource: NovaCompute}
@ -524,9 +520,6 @@ resources:
NodeExtraConfig: NodeExtraConfig:
depends_on: [ComputeExtraConfigPre, NodeTLSCAData] depends_on: [ComputeExtraConfigPre, NodeTLSCAData]
type: OS::TripleO::NodeExtraConfig type: OS::TripleO::NodeExtraConfig
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: NovaCompute} server: {get_resource: NovaCompute}
@ -549,21 +542,11 @@ resources:
update_identifier: update_identifier:
get_param: UpdateIdentifier get_param: UpdateIdentifier
DeploymentActions:
type: OS::Heat::Value
properties:
value:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey: SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey type: OS::TripleO::Ssh::HostPubKey
depends_on: NovaComputeDeployment depends_on: NovaComputeDeployment
properties: properties:
server: {get_resource: NovaCompute} server: {get_resource: NovaCompute}
deployment_actions: {get_attr: [DeploymentActions, value]}
outputs: outputs:
ip_address: ip_address:

View File

@ -406,7 +406,6 @@ resources:
properties: properties:
server: {get_resource: Controller} server: {get_resource: Controller}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkConfig: NetworkConfig:
type: OS::TripleO::Controller::Net::SoftwareConfig type: OS::TripleO::Controller::Net::SoftwareConfig
@ -553,9 +552,6 @@ resources:
ControllerExtraConfigPre: ControllerExtraConfigPre:
depends_on: ControllerDeployment depends_on: ControllerDeployment
type: OS::TripleO::ControllerExtraConfigPre type: OS::TripleO::ControllerExtraConfigPre
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: Controller} server: {get_resource: Controller}
@ -564,9 +560,6 @@ resources:
NodeExtraConfig: NodeExtraConfig:
depends_on: [ControllerExtraConfigPre, NodeTLSData] depends_on: [ControllerExtraConfigPre, NodeTLSData]
type: OS::TripleO::NodeExtraConfig type: OS::TripleO::NodeExtraConfig
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: Controller} server: {get_resource: Controller}
@ -589,21 +582,11 @@ resources:
update_identifier: update_identifier:
get_param: UpdateIdentifier get_param: UpdateIdentifier
DeploymentActions:
type: OS::Heat::Value
properties:
value:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey: SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey type: OS::TripleO::Ssh::HostPubKey
depends_on: ControllerDeployment depends_on: ControllerDeployment
properties: properties:
server: {get_resource: Controller} server: {get_resource: Controller}
deployment_actions: {get_attr: [DeploymentActions, value]}
outputs: outputs:
ip_address: ip_address:

View File

@ -377,7 +377,6 @@ resources:
properties: properties:
server: {get_resource: SwiftStorage} server: {get_resource: SwiftStorage}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
@ -486,9 +485,6 @@ resources:
NodeExtraConfig: NodeExtraConfig:
depends_on: NodeTLSCAData depends_on: NodeTLSCAData
type: OS::TripleO::NodeExtraConfig type: OS::TripleO::NodeExtraConfig
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: SwiftStorage} server: {get_resource: SwiftStorage}
@ -510,21 +506,11 @@ resources:
- ['CREATE', 'UPDATE'] - ['CREATE', 'UPDATE']
- [] - []
DeploymentActions:
type: OS::Heat::Value
properties:
value:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey: SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey type: OS::TripleO::Ssh::HostPubKey
depends_on: SwiftStorageHieraDeploy depends_on: SwiftStorageHieraDeploy
properties: properties:
server: {get_resource: SwiftStorage} server: {get_resource: SwiftStorage}
deployment_actions: {get_attr: [DeploymentActions, value]}
outputs: outputs:
ip_address: ip_address:

View File

@ -399,7 +399,6 @@ resources:
properties: properties:
server: {get_resource: {{role}}} server: {get_resource: {{role}}}
RoleParameters: {get_param: RoleParameters} RoleParameters: {get_param: RoleParameters}
deployment_actions: {get_attr: [DeploymentActions, value]}
NetworkDeployment: NetworkDeployment:
type: OS::TripleO::SoftwareDeployment type: OS::TripleO::SoftwareDeployment
@ -512,9 +511,6 @@ resources:
{{role}}ExtraConfigPre: {{role}}ExtraConfigPre:
depends_on: {{role}}Deployment depends_on: {{role}}Deployment
type: OS::TripleO::{{role}}ExtraConfigPre type: OS::TripleO::{{role}}ExtraConfigPre
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: {{role}}} server: {get_resource: {{role}}}
@ -523,9 +519,6 @@ resources:
NodeExtraConfig: NodeExtraConfig:
depends_on: [{{role}}ExtraConfigPre, NodeTLSCAData] depends_on: [{{role}}ExtraConfigPre, NodeTLSCAData]
type: OS::TripleO::NodeExtraConfig type: OS::TripleO::NodeExtraConfig
# We have to use conditions here so that we don't break backwards
# compatibility with templates everywhere
condition: server_not_blacklisted
properties: properties:
server: {get_resource: {{role}}} server: {get_resource: {{role}}}
@ -548,21 +541,11 @@ resources:
- ['CREATE', 'UPDATE'] - ['CREATE', 'UPDATE']
- [] - []
DeploymentActions:
type: OS::Heat::Value
properties:
value:
if:
- server_not_blacklisted
- ['CREATE', 'UPDATE']
- []
SshHostPubKey: SshHostPubKey:
type: OS::TripleO::Ssh::HostPubKey type: OS::TripleO::Ssh::HostPubKey
depends_on: {{role}}Deployment depends_on: {{role}}Deployment
properties: properties:
server: {get_resource: {{role}}} server: {get_resource: {{role}}}
deployment_actions: {get_attr: [DeploymentActions, value]}
outputs: outputs:
ip_address: ip_address: