Remove auto_attach and autoheal from FAM

Signed-off-by: Gaurav Talreja <[email protected]>

Author: Gauravtalreja1

plugins/modules/activation_key.py

@@ -103,10 +103,6 @@
           - default
         type: str
         required: true
-  auto_attach:
-    description:
-      - Set Auto-Attach on or off
-    type: bool
   release_version:
     description:
       - Set the content release version
@@ -180,7 +176,6 @@
         override: enabled
       - label: ExampleOrganization_ExampleCustomProduct_ExampleRepository
         override: enabled
-    auto_attach: false
     release_version: 7Server
     service_level: Standard
 '''
@@ -228,7 +223,6 @@ def main():
             lifecycle_environment=dict(type='entity', flat_name='environment_id', scope=['organization']),
             content_view=dict(type='entity', scope=['organization']),
             host_collections=dict(type='entity_list', scope=['organization']),
-            auto_attach=dict(type='bool'),
             release_version=dict(),
             service_level=dict(choices=['Self-Support', 'Standard', 'Premium']),
             max_hosts=dict(type='int'),
@@ -279,9 +273,9 @@ def main():
         # copied keys inherit the subscriptions of the origin, so one would not have to specify them again
         # deleted keys don't need subscriptions anymore either
         if module.state == 'present' or (module.state == 'present_with_defaults' and module.changed):
-            # the auto_attach, release_version and service_level parameters can only be set on an existing AK with an update,
+            # the release_version and service_level parameters can only be set on an existing AK with an update,
             # not during create, so let's force an update. see https://projects.theforeman.org/issues/27632 for details
-            if any(key in module.foreman_params for key in ['auto_attach', 'release_version', 'service_level']) and module.changed:
+            if any(key in module.foreman_params for key in ['release_version', 'service_level']) and module.changed:
                 activation_key = module.ensure_entity('activation_keys', module.foreman_params, activation_key, params=scope)
 
             ak_scope = {'activation_key_id': activation_key['id']}

roles/activation_keys/README.md

@@ -20,7 +20,6 @@ The following fields are required for an activation key but have defaults which
 
 The following fields are optional in the sense that the server will use default values when they are omitted:
 
-- `auto_attach`: Auto Attach behavior for the activation key. When true, it will attempt to attach a minimum of subscriptions (from the subset of assigned subscriptions on the activation key; selects from all subscriptions in the organization if none are assigned) to cover any present products on the host. When false, it will attempt to attach all subscriptions assigned on the activation key to the host at registration time. server defaults to true.
 - `unlimited_hosts`: Allow an unlimited number of hosts to register with the activation key when true. When false, the `max_hosts` parameter which sets a numerical limit on the number of hosts that can be registered becomes required. server defaults to true.
 
 The following fields are optional and will be omitted by default:
@@ -71,7 +70,6 @@ Define two Activation Keys. The first registers hosts in the "ACME" organization
         foreman_organization: "ACME"
         foreman_activation_keys:
           - name: "ACME_App_Key"
-            auto_attach: false
             subscriptions:
               - name: "ACME_App"
           - name: "ACME_RHEL7_Base_Test"

roles/activation_keys/tasks/main.yml

@@ -13,7 +13,6 @@
     host_collections: "{{ item.host_collections | default(omit) }}"
     subscriptions: "{{ item.subscriptions | default(omit) }}"
     content_overrides: "{{ item.content_overrides | default(omit) }}"
-    auto_attach: "{{ item.auto_attach | default(omit) }}"
     unlimited_hosts: "{{ item.unlimited_hosts | default(omit) }}"
     max_hosts: "{{ item.max_hosts | default(omit) }}"
     release_version: "{{ item.release_version | default(omit) }}"

roles/convert2rhel/tasks/activation_keys.yml

@@ -82,7 +82,6 @@
     name: "{{ foreman_convert2rhel_key_rhel7 }}"
     lifecycle_environment: "{{ foreman_convert2rhel_lifecycle_env }}"
     content_view: "{{ foreman_convert2rhel_content_view }}"
-    auto_attach: false
   when: foreman_content_rhel_enable_rhel7
 
 - name: "Create activation key '{{ foreman_convert2rhel_key_rhel8 }}'"
@@ -95,7 +94,6 @@
     name: "{{ foreman_convert2rhel_key_rhel8 }}"
     lifecycle_environment: "{{ foreman_convert2rhel_lifecycle_env }}"
     content_view: "{{ foreman_convert2rhel_content_view }}"
-    auto_attach: false
   when: foreman_content_rhel_enable_rhel8
 
 - name: "Add subscriptions to '{{ foreman_convert2rhel_key_rhel7 }}'"

tests/test_playbooks/activation_key.yml

@@ -128,38 +128,6 @@
         activation_key_state: absent
         expected_change: true
 
-    - name: create AK with auto_attach=true
-      include_tasks: tasks/activation_key.yml
-      vars:
-        activation_key_auto_attach: true
-        expected_change: true
-    - name: create AK with auto_attach=true again, no change
-      include_tasks: tasks/activation_key.yml
-      vars:
-        activation_key_auto_attach: true
-        expected_change: false
-    - name: remove AK with auto_attach=true
-      include_tasks: tasks/activation_key.yml
-      vars:
-        activation_key_state: absent
-        expected_change: true
-
-    - name: create AK with auto_attach=false
-      include_tasks: tasks/activation_key.yml
-      vars:
-        activation_key_auto_attach: false
-        expected_change: true
-    - name: create AK with auto_attach=false again, no change
-      include_tasks: tasks/activation_key.yml
-      vars:
-        activation_key_auto_attach: false
-        expected_change: false
-    - name: remove AK with auto_attach=false
-      include_tasks: tasks/activation_key.yml
-      vars:
-        activation_key_state: absent
-        expected_change: true
-
     - name: create AK with unlimited_hosts=false
       include_tasks: tasks/activation_key.yml
       vars:

tests/test_playbooks/activation_keys_role.yml

@@ -25,4 +25,3 @@
         foreman_activation_keys:
           - name: Testkey1
           - name: Testkey2
-            auto_attach: false

tests/test_playbooks/fixtures/activation_key-0.yml

@@ -14,18 +14,14 @@ interactions:
     uri: https://foreman.example.org/api/status
   response:
     body:
-      string: '{"satellite_version":"6.16.0","result":"ok","status":200,"version":"3.11.0-develop","api_version":2}'
+      string: '{"satellite_version":"6.19.0","result":"ok","status":200,"version":"3.18.0-develop","api_version":2}'
     headers:
       Cache-Control:
       - max-age=0, private, must-revalidate
       Connection:
       - Keep-Alive
       Content-Length:
       - '100'
-      Content-Security-Policy:
-      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
-        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
-        style-src ''unsafe-inline'' ''self'''
       Content-Type:
       - application/json; charset=utf-8
       Foreman_api_version:
@@ -35,21 +31,27 @@ interactions:
       Foreman_current_organization:
       - ; ANY
       Foreman_version:
-      - 3.11.0-develop
+      - 3.18.0-develop
       Keep-Alive:
       - timeout=15, max=100
-      Strict-Transport-Security:
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      content-security-policy:
+      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
+        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
+        style-src ''unsafe-inline'' ''self'''
+      strict-transport-security:
       - max-age=631139040; includeSubdomains
-      X-Content-Type-Options:
+      x-content-type-options:
       - nosniff
-      X-Download-Options:
+      x-download-options:
       - noopen
-      X-Frame-Options:
+      x-frame-options:
       - sameorigin
-      X-Permitted-Cross-Domain-Policies:
+      x-permitted-cross-domain-policies:
       - none
-      X-XSS-Protection:
-      - 1; mode=block
+      x-xss-protection:
+      - '0'
     status:
       code: 200
       message: OK
@@ -70,8 +72,8 @@ interactions:
     body:
       string: "{\n  \"total\": 2,\n  \"subtotal\": 1,\n  \"page\": 1,\n  \"per_page\":
         4294967296,\n  \"search\": \"name=\\\"Test Organization\\\"\",\n  \"sort\":
-        {\n    \"by\": null,\n    \"order\": null\n  },\n  \"results\": [{\"label\":\"Test_Organization\",\"created_at\":\"2024-04-15
-        16:24:33 UTC\",\"updated_at\":\"2024-04-15 16:24:34 UTC\",\"id\":4,\"name\":\"Test
+        {\n    \"by\": null,\n    \"order\": null\n  },\n  \"results\": [{\"label\":\"Test_Organization\",\"created_at\":\"2025-11-26
+        08:13:21 UTC\",\"updated_at\":\"2025-11-26 08:13:23 UTC\",\"id\":3,\"name\":\"Test
         Organization\",\"title\":\"Test Organization\",\"description\":\"A test organization\"}]\n}\n"
     headers:
       Cache-Control:
@@ -80,10 +82,6 @@ interactions:
       - Keep-Alive
       Content-Length:
       - '388'
-      Content-Security-Policy:
-      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
-        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
-        style-src ''unsafe-inline'' ''self'''
       Content-Type:
       - application/json; charset=utf-8
       Foreman_api_version:
@@ -93,21 +91,27 @@ interactions:
       Foreman_current_organization:
       - ; ANY
       Foreman_version:
-      - 3.11.0-develop
+      - 3.18.0-develop
       Keep-Alive:
       - timeout=15, max=99
-      Strict-Transport-Security:
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      content-security-policy:
+      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
+        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
+        style-src ''unsafe-inline'' ''self'''
+      strict-transport-security:
       - max-age=631139040; includeSubdomains
-      X-Content-Type-Options:
+      x-content-type-options:
       - nosniff
-      X-Download-Options:
+      x-download-options:
       - noopen
-      X-Frame-Options:
+      x-frame-options:
       - sameorigin
-      X-Permitted-Cross-Domain-Policies:
+      x-permitted-cross-domain-policies:
       - none
-      X-XSS-Protection:
-      - 1; mode=block
+      x-xss-protection:
+      - '0'
     status:
       code: 200
       message: OK
@@ -123,10 +127,10 @@ interactions:
       User-Agent:
       - apypie (https://github.com/Apipie/apypie)
     method: GET
-    uri: https://foreman.example.org/katello/api/organizations/4/activation_keys?search=name%3D%22Test+Activation+Key%22&per_page=4294967296
+    uri: https://foreman.example.org/katello/api/organizations/3/activation_keys?search=name%3D%22Test+Activation+Key%22&per_page=4294967296
   response:
     body:
-      string: '{"total":0,"subtotal":0,"selectable":0,"page":1,"per_page":"4294967296","error":null,"search":"name=\"Test
+      string: '{"total":0,"subtotal":0,"selectable":0,"page":1,"per_page":4294967296,"error":null,"search":"name=\"Test
         Activation Key\"","sort":{"by":"name","order":"asc"},"results":[]}
 
         '
@@ -136,40 +140,42 @@ interactions:
       Connection:
       - Keep-Alive
       Content-Length:
-      - '174'
-      Content-Security-Policy:
-      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
-        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
-        style-src ''unsafe-inline'' ''self'''
+      - '172'
       Content-Type:
       - application/json; charset=utf-8
       Foreman_api_version:
       - '2'
       Foreman_current_location:
       - ; ANY
       Foreman_current_organization:
-      - 4; Test Organization
+      - 3; Test Organization
       Foreman_version:
-      - 3.11.0-develop
+      - 3.18.0-develop
       Keep-Alive:
       - timeout=15, max=98
-      Strict-Transport-Security:
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      content-security-policy:
+      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
+        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
+        style-src ''unsafe-inline'' ''self'''
+      strict-transport-security:
       - max-age=631139040; includeSubdomains
-      X-Content-Type-Options:
+      x-content-type-options:
       - nosniff
-      X-Download-Options:
+      x-download-options:
       - noopen
-      X-Frame-Options:
+      x-frame-options:
       - sameorigin
-      X-Permitted-Cross-Domain-Policies:
+      x-permitted-cross-domain-policies:
       - none
-      X-XSS-Protection:
-      - 1; mode=block
+      x-xss-protection:
+      - '0'
     status:
       code: 200
       message: OK
 - request:
-    body: '{"organization_id": 4, "name": "Test Activation Key"}'
+    body: '{"name": "Test Activation Key", "organization_id": 3}'
     headers:
       Accept:
       - application/json;version=2
@@ -187,10 +193,10 @@ interactions:
     uri: https://foreman.example.org/katello/api/activation_keys
   response:
     body:
-      string: '  {"service_level":null,"content_overrides":[],"id":16,"name":"Test
-        Activation Key","description":null,"unlimited_hosts":true,"auto_attach":true,"content_view_id":null,"environment_id":null,"usage_count":0,"user_id":4,"max_hosts":null,"release_version":null,"purpose_usage":null,"purpose_role":null,"organization_id":4,"organization":{"name":"Test
-        Organization","label":"Test_Organization","id":4},"created_at":"2024-04-15
-        16:24:42 UTC","updated_at":"2024-04-15 16:24:42 UTC","content_view":null,"environment":null,"products":[],"host_collections":[],"purpose_addons":[],"permissions":{"view_activation_keys":true,"edit_activation_keys":true,"destroy_activation_keys":true}}
+      string: '  {"service_level":null,"content_overrides":[],"id":1,"name":"Test
+        Activation Key","description":null,"unlimited_hosts":true,"content_view_environment_labels":"","usage_count":0,"user_id":4,"max_hosts":null,"release_version":null,"purpose_usage":null,"purpose_role":null,"organization_id":3,"organization":{"name":"Test
+        Organization","label":"Test_Organization","id":3},"created_at":"2025-11-26
+        08:13:42 UTC","updated_at":"2025-11-26 08:13:42 UTC","content_view_environments":[],"products":[],"host_collections":[],"multi_content_view_environment":false,"content_view_id":null,"content_view":null,"environment_id":null,"environment":null,"permissions":{"view_activation_keys":true,"edit_activation_keys":true,"destroy_activation_keys":true}}
 
         '
     headers:
@@ -199,35 +205,37 @@ interactions:
       Connection:
       - Keep-Alive
       Content-Length:
-      - '675'
-      Content-Security-Policy:
-      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
-        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
-        style-src ''unsafe-inline'' ''self'''
+      - '742'
       Content-Type:
       - application/json; charset=utf-8
       Foreman_api_version:
       - '2'
       Foreman_current_location:
       - ; ANY
       Foreman_current_organization:
-      - 4; Test Organization
+      - 3; Test Organization
       Foreman_version:
-      - 3.11.0-develop
+      - 3.18.0-develop
       Keep-Alive:
       - timeout=15, max=97
-      Strict-Transport-Security:
+      Referrer-Policy:
+      - strict-origin-when-cross-origin
+      content-security-policy:
+      - 'default-src ''self''; child-src ''self''; connect-src ''self'' ws: wss:;
+        img-src ''self'' data:; script-src ''unsafe-eval'' ''unsafe-inline'' ''self'';
+        style-src ''unsafe-inline'' ''self'''
+      strict-transport-security:
       - max-age=631139040; includeSubdomains
-      X-Content-Type-Options:
+      x-content-type-options:
       - nosniff
-      X-Download-Options:
+      x-download-options:
       - noopen
-      X-Frame-Options:
+      x-frame-options:
       - sameorigin
-      X-Permitted-Cross-Domain-Policies:
+      x-permitted-cross-domain-policies:
       - none
-      X-XSS-Protection:
-      - 1; mode=block
+      x-xss-protection:
+      - '0'
     status:
       code: 201
       message: Created