From 27295e92da72a75b104fb94c1a2dc83fd916b06b Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Wed, 28 Oct 2020 23:40:28 +0100 Subject: [PATCH] docstranslation: use include_role instead of import_role --- playbooks/openshift-apps/docstranslation.yml | 21 +++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/playbooks/openshift-apps/docstranslation.yml b/playbooks/openshift-apps/docstranslation.yml index b9148a3145..aefa4229ce 100644 --- a/playbooks/openshift-apps/docstranslation.yml +++ b/playbooks/openshift-apps/docstranslation.yml @@ -10,7 +10,8 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - import_role: + - name: Define Project + include_role: name: openshift/project vars: description: Documentation translation @@ -31,23 +32,27 @@ size: 4096 register: r_ssh_key - - import_role: + - name: Define imagestream + include_role: name: openshift/imagestream vars: imagename: builder - - import_role: + - name: Define buildconfig + include_role: name: openshift/object vars: objectname: buildconfig.yml file: buildconfig.yml - - import_role: + - name: Start build + include_role: name: openshift/start-build vars: buildname: docstranslation-build - - import_role: + - name: Define secrets + include_role: name: openshift/object vars: objectname: secrets.yml @@ -55,7 +60,8 @@ tags: - deploy-secrets - - import_role: + - name: Define cron job + include_role: name: openshift/object vars: file: cron.yml @@ -67,7 +73,8 @@ # actions to delete the project from OpenShift ############################################### # to run: sudo rbac-playbook -l os_masters_stg[0] -t delete openshift-apps/docstranslation.yml - - import_role: + - name: Delete cron jobs + include_role: name: openshift/object-delete vars: objecttype: cronjob