Don't unregister on system/resource delete

Don't unregister systems from the portal/satellite
when deleting from Heat. There are several reasons why
it's compelling to fix this behavior. See
https://bugs.launchpad.net/tripleo/+bug/1710144
for full information. The previous behavior can be triggered
by setting the DeleteOnRHELUnregistration parameter to "true".

Closes-Bug: #1710144
Change-Id: I909a6f7a049dc23fc27f2231a4893d428f06a1f1
This commit is contained in:
James Slagle 2017-08-11 08:05:10 -04:00
parent 589b18dafc
commit 35ed6c6065
2 changed files with 26 additions and 17 deletions

View File

@ -59,19 +59,18 @@ 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: DeleteOnRHELUnregistration:
default: ['CREATE', 'UPDATE'] type: boolean
type: comma_delimited_list default: false
description: > description: |
List of stack actions that will trigger any deployments in this When true, the system profile will be deleted from the registration
templates. The actions will be an empty list of the server is in the service when the rhel-registration.yaml nested stack is deleted.
toplevel DeploymentServerBlacklist parameter's value.
conditions: conditions:
deployment_actions_empty: unregister_on_delete:
equals: equals:
- {get_param: deployment_actions} - {get_param: DeleteOnRHELUnregistration}
- [] - true
update_requested: update_requested:
equals: equals:
- {get_param: UpdateOnRHELRegistration} - {get_param: UpdateOnRHELRegistration}
@ -79,6 +78,12 @@ conditions:
resources: resources:
DeploymentActions:
type: OS::Heat::Value
properties:
value:
yaql
RHELRegistration: RHELRegistration:
type: OS::Heat::SoftwareConfig type: OS::Heat::SoftwareConfig
properties: properties:
@ -155,9 +160,9 @@ resources:
config: {get_resource: RHELUnregistration} config: {get_resource: RHELUnregistration}
actions: actions:
if: if:
- deployment_actions_empty - unregister_on_delete
- ['DELETE']
- [] - []
- ['DELETE'] # Only do this on DELETE
input_values: input_values:
REG_METHOD: {get_param: rhel_reg_method} REG_METHOD: {get_param: rhel_reg_method}
@ -189,11 +194,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

@ -0,0 +1,8 @@
---
fixes:
- Don't unregister systems from the portal/satellite
when deleting from Heat. There are several reasons why
it's compelling to fix this behavior. See
https://bugs.launchpad.net/tripleo/+bug/1710144
for full information. The previous behavior can be triggered
by setting the DeleteOnRHELUnregistration parameter to "true".