Prefix openshift/object-delete

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
2024-11-28 18:12:04 +01:00 · 2024-11-28 18:12:04 +01:00 · 560a31ef5b
commit 560a31ef5b
parent cfb590c2ed
17 changed files with 60 additions and 57 deletions
--- a/playbooks/manual/upgrade/datanommer.yml
+++ b/playbooks/manual/upgrade/datanommer.yml
@ -65,9 +65,9 @@

 - name: Delete the job in case it finished
  role: openshift/object-delete
-  app: datanommer
-  objecttype: job
-  objectname: db-upgrade
+  object_delete_app: datanommer
+  object_delete_objecttype: job
+  object_delete_objectname: db-upgrade
  when: status.stdout | int == 1

 - name: Start the datanommer again
--- a/playbooks/openshift-apps/compose-tracker.yml
+++ b/playbooks/openshift-apps/compose-tracker.yml
@ -54,7 +54,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg[0] -t delete openshift-apps/compose-tracker.yml
  - role: openshift/object-delete
-    app: compose-tracker
-    objecttype: project
-    objectname: compose-tracker
+    object_delete_app: compose-tracker
+    object_delete_objecttype: project
+    object_delete_objectname: compose-tracker
    tags: [never, delete]
--- a/playbooks/openshift-apps/coreos-ci.yml
+++ b/playbooks/openshift-apps/coreos-ci.yml
@ -25,7 +25,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/coreos-ci.yml
  - role: openshift/object-delete
-    app: coreos-ci
-    objecttype: project
-    objectname: coreos-ci
+    object_delete_app: coreos-ci
+    object_delete_objecttype: project
+    object_delete_objectname: coreos-ci
    tags: [never, delete]
--- a/playbooks/openshift-apps/coreos-cincinnati.yml
+++ b/playbooks/openshift-apps/coreos-cincinnati.yml
@ -102,7 +102,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/coreos-cincinnati.yml
  - role: openshift/object-delete
-    app: coreos-cincinnati
-    objecttype: project
-    objectname: coreos-cincinnati
+    object_delete_app: coreos-cincinnati
+    object_delete_objecttype: project
+    object_delete_objectname: coreos-cincinnati
    tags: [never, delete]
--- a/playbooks/openshift-apps/coreos-koji-tagger.yml
+++ b/playbooks/openshift-apps/coreos-koji-tagger.yml
@ -64,7 +64,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/coreos-koji-tagger.yml
  - role: openshift/object-delete
-    app: coreos-koji-tagger
-    objecttype: project
-    objectname: coreos-koji-tagger
+    object_delete_app: coreos-koji-tagger
+    object_delete_objecttype: project
+    object_delete_objectname: coreos-koji-tagger
    tags: [never, delete]
--- a/playbooks/openshift-apps/coreos-ostree-importer.yml
+++ b/playbooks/openshift-apps/coreos-ostree-importer.yml
@ -100,7 +100,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/coreos-ostree-importer.yml
  - role: openshift/object-delete
-    app: coreos-ostree-importer
-    objecttype: project
-    objectname: coreos-ostree-importer
+    object_delete_app: coreos-ostree-importer
+    object_delete_objecttype: project
+    object_delete_objectname: coreos-ostree-importer
    tags: [never, delete]
--- a/playbooks/openshift-apps/docsbuilding.yml
+++ b/playbooks/openshift-apps/docsbuilding.yml
@ -66,12 +66,12 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_masters_stg[0] -t delete openshift-apps/docsbuilding.yml
  - role: openshift/object-delete
-    app: docsbuilding
-    objecttype: cronjob
-    objectname: cron
+    object_delete_app: docsbuilding
+    object_delete_objecttype: cronjob
+    object_delete_objectname: cron
    tags: [never, delete]
  - role: openshift/object-delete
-    app: docsbuilding
-    objecttype: cronjob
-    objectname: cron-translated
+    object_delete_app: docsbuilding
+    object_delete_objecttype: cronjob
+    object_delete_objectname: cron-translated
    tags: [never, delete]
--- a/playbooks/openshift-apps/docstranslation.yml
+++ b/playbooks/openshift-apps/docstranslation.yml
@ -80,8 +80,9 @@
    ansible.builtin.include_role:
      name: openshift/object-delete
    vars:
-      objecttype: project
-      objectname: docstranslation
+      object_delete_app: docstranslation
+      object_delete_objecttype: project
+      object_delete_objectname: docstranslation
    tags:
    - never
    - delete
--- a/playbooks/openshift-apps/fedora-coreos-pipeline.yml
+++ b/playbooks/openshift-apps/fedora-coreos-pipeline.yml
@ -53,7 +53,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/fedora-coreos-pipeline.yml
  - role: openshift/object-delete
-    app: fedora-coreos-pipeline
-    objecttype: project
-    objectname: fedora-coreos-pipeline
+    object_delete_app: fedora-coreos-pipeline
+    object_delete_objecttype: project
+    object_delete_objectname: fedora-coreos-pipeline
    tags: [never, delete]
--- a/playbooks/openshift-apps/fedora-ostree-pruner.yml
+++ b/playbooks/openshift-apps/fedora-ostree-pruner.yml
@ -47,7 +47,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/fedora-ostree-pruner.yml
  - role: openshift/object-delete
-    app: fedora-ostree-pruner
-    objecttype: project
-    objectname: fedora-ostree-pruner
+    object_delete_app: fedora-ostree-pruner
+    object_delete_objecttype: project
+    object_delete_objectname: fedora-ostree-pruner
    tags: [never, delete]
--- a/playbooks/openshift-apps/fedora-packages-static.yml
+++ b/playbooks/openshift-apps/fedora-packages-static.yml
@ -64,14 +64,14 @@
 ###############################################
 # to run: sudo rbac-playbook -l staging -t delete openshift-apps/fedora-packages-static.yml
  - role: openshift/object-delete
-    app: fedora-packages-static
-    objecttype: project
-    objectname: fedora-packages-static
+    object_delete_app: fedora-packages-static
+    object_delete_objecttype: project
+    object_delete_objectname: fedora-packages-static
    tags: [never, delete]

  # to run: sudo rbac-playbook -l staging -t deletesolr openshift-apps/fedora-packages-static.yml
  - role: openshift/object-delete
-    app: solr
-    objecttype: project
-    objectname: solr
+    object_delete_app: solr
+    object_delete_objecttype: project
+    object_delete_objectname: solr
    tags: [never, deletesolr]
--- a/playbooks/openshift-apps/languages.yml
+++ b/playbooks/openshift-apps/languages.yml
@ -63,9 +63,9 @@
 ###############################################
 # to run: sudo rbac-playbook -l os_masters_stg[0] -t delete openshift-apps/languages.yml
  - role: openshift/object-delete
-    app: languages
-    objecttype: project
-    objectname: languages
+    object_delete_app: languages
+    object_delete_objecttype: project
+    object_delete_objectname: languages
    tags:
    - never
    - delete
--- a/playbooks/openshift-apps/maubot.yml
+++ b/playbooks/openshift-apps/maubot.yml
@ -117,7 +117,7 @@
  ###############################################
  # to run: sudo rbac-playbook -l os_control_stg -t delete openshift-apps/maubot.yml
  - role: openshift/object-delete
-    app: maubot
-    objecttype: project
-    objectname: maubot
+    object_delete_app: maubot
+    object_delete_objecttype: project
+    object_delete_objectname: maubot
    tags: [never, delete]
--- a/playbooks/openshift-apps/mote.yml
+++ b/playbooks/openshift-apps/mote.yml
@ -89,8 +89,9 @@
 ###############################################
 # to run: sudo rbac-playbook -l os_control_stg[0] -t delete openshift-apps/mote.yml
  - role: openshift/object-delete
-    objecttype: project
-    objectname: mote
+    object_delete_app: mote
+    object_delete_objecttype: project
+    object_delete_objectname: mote
    tags:
    - never
    - delete
--- a/playbooks/openshift-apps/openscanhub.yml
+++ b/playbooks/openshift-apps/openscanhub.yml
@ -169,8 +169,8 @@

    # sudo rbac-playbook -l staging -t delete openshift-apps/openscanhub.yml
  - role: openshift/object-delete
-    app: openscanhub
-    objecttype: project
-    objectname: openscanhub
+    object_delete_app: openscanhub
+    object_delete_objecttype: project
+    object_delete_objectname: openscanhub
    tags: [never, delete]
    when: env == "staging"
--- a/playbooks/openshift-apps/openvpn.yml
+++ b/playbooks/openshift-apps/openvpn.yml
@ -65,9 +65,10 @@
 # actions to delete the project from OpenShift
 ###############################################
 # to run: sudo rbac-playbook -l os_masters_stg[0] -t delete openshift-apps/openvpn.yml
-  - role: openshift/object-delete
-    objecttype: project
-    objectname: openvpn
+  - object_delete_role: openshift/object-delete
+    object_delete_app: openvpn
+    object_delete_objecttype: project
+    object_delete_objectname: openvpn
    tags:
    - never
    - delete
--- a/roles/openshift/object-delete/tasks/main.yml
+++ b/roles/openshift/object-delete/tasks/main.yml
@ -1,15 +1,15 @@
 ---
 - name: Delete object file ({{tmpfile.path}})
  file:
-    path=/etc/openshift_apps/{{app}}/{{objectname}}.yml
+    path=/etc/openshift_apps/{{object_delete_app}}/{{object_delete_objectname}}.yml
    state=absent
-  when: objecttype != 'project'
+  when: object_delete_objecttype != 'project'

 - name: Delete project files ({{tmpfile.path}})
  file:
-    path=/etc/openshift_apps/{{app}}
+    path=/etc/openshift_apps/{{object_delete_app}}
    state=absent
-  when: objecttype == 'project'
+  when: object_delete_objecttype == 'project'

 - name: Call `oc delete` on the object
-  shell: oc -n {{app}} delete {{objecttype}}/{{objectname}}
+  shell: oc -n {{object_delete_app}} delete {{object_delete_objecttype}}/{{object_delete_objectname}}