diff --git a/README.md b/README.md index 2c599a0..71ffacf 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,17 @@ GitOps our Foreman. This is where most of our Foreman configuration lives. * disable the new repo in all relevant activation keys or create a new key in `roles/content/tasks/activation_keys.yaml` * your content views need to be published to Prod for this step! this isn't currently automated +### Removing old Products + +Products are removed once they are not in active use by any content view. Hence deprovisioning a component needs to be done in stages: + +* remove the product from `roles/content/tasks/content_views.yaml` and from the publish and promote playbooks in `playbooks/` +* at this stage, there are probably still active users of the old content view so we wait until a new version of the content view is released and they are life cycled +* once there are no more active users, we can stop syncing the product since we don't need updated errata anymore, we remove it from `roles/content/tasks/sync_plans.yaml` +* at this point, there are still old versions of content views that may contain the product. it will take a while until `playbooks/content_view_version_cleanup.yml` removes them +* after checking that there are no more dependencies on the product, they get changed to `state: absent` in `roles/content/tasks/products.yaml` removing them from our foreman, at this point the list of repositories is also removed from the file +* Once they are gone from Foreman they can be removed from this repo with the next major release (or any 0.x release) + ## License This collection is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, version 3 of the License. diff --git a/playbooks/content_view_promote.yml b/playbooks/content_view_promote.yml index da88501..cc58577 100644 --- a/playbooks/content_view_promote.yml +++ b/playbooks/content_view_promote.yml @@ -9,9 +9,6 @@ - CentOS 7 Base x86_64 - AlmaLinux 9 Base x86_64 - Zabbix 3.0 Agent EL7 x86_64 - - Zabbix 6.0 Agent EL7 x86_64 - - Zabbix 6.0 Agent EL8 x86_64 - - Zabbix 6.0 Agent EL9 x86_64 - CentOS 7 x86_64 - AlmaLinux 9 x86_64 rabe_foreman_lifecycle_environments: diff --git a/playbooks/content_view_publish.yml b/playbooks/content_view_publish.yml index c31ad9e..b3e38be 100644 --- a/playbooks/content_view_publish.yml +++ b/playbooks/content_view_publish.yml @@ -9,9 +9,6 @@ - CentOS 7 Base x86_64 - AlmaLinux 9 Base x86_64 - Zabbix 3.0 Agent EL7 x86_64 - - Zabbix 6.0 Agent EL7 x86_64 - - Zabbix 6.0 Agent EL8 x86_64 - - Zabbix 6.0 Agent EL9 x86_64 rabe_foreman_composite_content_views: - CentOS 7 x86_64 - AlmaLinux 9 x86_64 diff --git a/roles/content/tasks/content_views.yaml b/roles/content/tasks/content_views.yaml index e632b81..7b3470c 100644 --- a/roles/content/tasks/content_views.yaml +++ b/roles/content/tasks/content_views.yaml @@ -45,6 +45,8 @@ product: RaBe Audio EL7 - name: Nux Dextop EL7 product: Nux Dextop EL7 + - name: Zabbix 6.4 Official Repository - EL7 - x86_64 + product: Zabbix 6.4 EL7 - name: AlmaLinux 9 Base x86_64 repositories: - name: AlmaLinux 9 BaseOS x86_64 diff --git a/roles/content/tasks/products.yaml b/roles/content/tasks/products.yaml index 8c51180..6c6882d 100644 --- a/roles/content/tasks/products.yaml +++ b/roles/content/tasks/products.yaml @@ -421,6 +421,15 @@ url: https://repo.zabbix.com/non-supported/rhel/9/x86_64/ download_policy: on_demand auto_enabled: false + - name: Zabbix 6.4 EL7 + label: zabbix64el7 + repositories: + - name: Zabbix 6.4 Official Repository - EL7 - x86_64 + content_type: yum + label: zabbix64el7 + url: https://repo.zabbix.com/zabbix/6.4/rhel/7/x86_64/ + download_policy: on_demand + auto_enabled: false - name: Zabbix 6.4 EL9 label: zabbix64 repositories: diff --git a/roles/content/tasks/sync_plans.yaml b/roles/content/tasks/sync_plans.yaml index 66b1e6f..15f9a35 100644 --- a/roles/content/tasks/sync_plans.yaml +++ b/roles/content/tasks/sync_plans.yaml @@ -20,8 +20,7 @@ - Foreman Client 3.9 EL9 - RaBe Logstash Addons EL7 - Zabbix 3.0 (LTS) EL7 - - Zabbix 6.0 (LTS) EL7 - - Zabbix 6.0 (LTS) EL9 + - Zabbix 6.4 EL7 - Zabbix 6.4 EL9 - RaBe Linux EL7 - RaBe Linux EL8