Browse Source

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
tags/7.0.0.0rc1
James Slagle 2 years ago
parent
commit
35ed6c6065
2 changed files with 26 additions and 17 deletions
  1. +18
    -17
      extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
  2. +8
    -0
      releasenotes/notes/dont-unregister-on-delete-9708f7cbc73a0d2f.yaml

+ 18
- 17
extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml View File

@@ -59,19 +59,18 @@ parameters:
description: |
When enabled, the system will perform a yum update after performing the
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.
DeleteOnRHELUnregistration:
type: boolean
default: false
description: |
When true, the system profile will be deleted from the registration
service when the rhel-registration.yaml nested stack is deleted.

conditions:
deployment_actions_empty:
unregister_on_delete:
equals:
- {get_param: deployment_actions}
- []
- {get_param: DeleteOnRHELUnregistration}
- true
update_requested:
equals:
- {get_param: UpdateOnRHELRegistration}
@@ -79,6 +78,12 @@ conditions:

resources:

DeploymentActions:
type: OS::Heat::Value
properties:
value:
yaql

RHELRegistration:
type: OS::Heat::SoftwareConfig
properties:
@@ -155,9 +160,9 @@ resources:
config: {get_resource: RHELUnregistration}
actions:
if:
- deployment_actions_empty
- unregister_on_delete
- ['DELETE']
- []
- ['DELETE'] # Only do this on DELETE
input_values:
REG_METHOD: {get_param: rhel_reg_method}

@@ -189,11 +194,7 @@ resources:
name: UpdateDeploymentAfterRHELRegistration
config: {get_resource: YumUpdateConfigurationAfterRHELRegistration}
server: {get_param: server}
actions:
if:
- deployment_actions_empty
- []
- ['CREATE'] # Only do this on CREATE
actions: ['CREATE'] # Only do this on CREATE

outputs:
deploy_stdout:

+ 8
- 0
releasenotes/notes/dont-unregister-on-delete-9708f7cbc73a0d2f.yaml 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".

Loading…
Cancel
Save