diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml index 651ca0eb32..bcfd8a82bf 100644 --- a/playbooks/manual/upgrade/bodhi.yml +++ b/playbooks/manual/upgrade/bodhi.yml @@ -155,9 +155,9 @@ - import_role: name: openshift/object vars: - app: bodhi - template: buildconfig.yml - objectname: buildconfig.yml + object_app: bodhi + object_template: buildconfig.yml + object_objectname: buildconfig.yml when: env != "staging" # Start a build with the new buildconfig # Only do it on prod because staging builds are triggered by Github's webhook diff --git a/playbooks/manual/upgrade/datanommer.yml b/playbooks/manual/upgrade/datanommer.yml index e9613ae8fa..e8b5f13232 100644 --- a/playbooks/manual/upgrade/datanommer.yml +++ b/playbooks/manual/upgrade/datanommer.yml @@ -52,9 +52,9 @@ - name: Upgrade the database role: openshift/object - app: datanommer - template: job.yml - objectname: job.yml + object_app: datanommer + object_template: job.yml + object_objectname: job.yml - name: Wait for the db-upgrade completion command: oc get jobs/db-upgrade -o jsonpath='{@.status.succeeded}' diff --git a/playbooks/openshift-apps/asknot.yml b/playbooks/openshift-apps/asknot.yml index c3486cd98b..de21797f4f 100644 --- a/playbooks/openshift-apps/asknot.yml +++ b/playbooks/openshift-apps/asknot.yml @@ -18,14 +18,14 @@ - kevin - role: openshift/object - app: asknot - template: imagestream.yml - objectname: imagestream.yml + object_app: asknot + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: asknot - template: buildconfig.yml - objectname: buildconfig.yml + object_app: asknot + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: asknot @@ -33,9 +33,9 @@ objectname: asknot-build - role: openshift/object - app: asknot - file: service.yml - objectname: service.yml + object_app: asknot + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: asknot @@ -54,9 +54,9 @@ when: env == "production" - role: openshift/object - app: asknot - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: asknot + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: asknot diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index 5776e2f636..bdf227f51b 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/playbooks/openshift-apps/badges.yml @@ -94,34 +94,34 @@ - apply-appowners - role: openshift/object - app: badges - file: imagestream.yml - objectname: imagestream.yml + object_app: badges + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: badges - template: buildconfig.yml - objectname: buildconfig.yml + object_app: badges + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: badges - template: secrets.yml - objectname: secrets.yml + object_app: badges + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: badges - template: configmap.yml - objectname: configmap.yml + object_app: badges + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: badges - file: service.yml - objectname: service.yml + object_app: badges + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: badges - file: storage.yml - objectname: storage.yml + object_app: badges + object_file: storage.yml + object_objectname: storage.yml # Routes - role: openshift/route @@ -180,19 +180,19 @@ # Deployment config - role: openshift/object - app: badges - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: badges + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # Cron jobs - role: openshift/object - app: badges - template: cron-award.yml - objectname: cron-award.yml + object_app: badges + object_template: cron-award.yml + object_objectname: cron-award.yml - role: openshift/object - app: badges - template: cron-update-rules.yml - objectname: cron-update-rules.yml + object_app: badges + object_template: cron-update-rules.yml + object_objectname: cron-update-rules.yml - role: openshift/start-build app: badges diff --git a/playbooks/openshift-apps/blockerbugs.yml b/playbooks/openshift-apps/blockerbugs.yml index 8f545d7529..2514c111c4 100644 --- a/playbooks/openshift-apps/blockerbugs.yml +++ b/playbooks/openshift-apps/blockerbugs.yml @@ -87,34 +87,34 @@ - appowners - role: openshift/object - app: blockerbugs - template: buildconfig.yml - objectname: buildconfig.yml + object_app: blockerbugs + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: blockerbugs - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: blockerbugs + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: blockerbugs - template: imagestream.yml - objectname: imagestream.yml + object_app: blockerbugs + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: blockerbugs - file: service.yml - objectname: service.yml + object_app: blockerbugs + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: blockerbugs - template: secret.yml - objectname: secret.yml + object_app: blockerbugs + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: blockerbugs - template: cron.yml - objectname: cron.yml + object_app: blockerbugs + object_template: cron.yml + object_objectname: cron.yml - role: openshift/route app: blockerbugs diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index b654080d75..78fbb3ef5c 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -70,9 +70,9 @@ - apply-appowners when: env == "staging" - role: openshift/object - app: bodhi - file: pvc.yml - objectname: pvc.yml + object_app: bodhi + object_file: pvc.yml + object_objectname: pvc.yml - role: openshift/keytab app: bodhi key: koji-keytab @@ -95,36 +95,36 @@ key: bodhi-key.pem privatefile: "rabbitmq/{{env}}/pki/private/bodhi{{env_suffix}}.key" - role: openshift/object - app: bodhi - template: imagestreams-tagged.yml - objectname: imagestreams.yml + object_app: bodhi + object_template: imagestreams-tagged.yml + object_objectname: imagestreams.yml - role: openshift/imagestream app: bodhi imagename: bodhi-base - role: openshift/object - app: bodhi - template: buildconfig.yml - objectname: buildconfig.yml + object_app: bodhi + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: bodhi buildname: bodhi-base - role: openshift/object - app: bodhi - template_fullpath: "{{roles_path}}/bodhi2/base/templates/configmap.yml" - objectname: configmap.yml + object_app: bodhi + object_template_fullpath: "{{roles_path}}/bodhi2/base/templates/configmap.yml" + object_objectname: configmap.yml - role: openshift/object - app: bodhi - file: service.yml - objectname: service.yml + object_app: bodhi + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: bodhi - file: servicemonitor.yml - objectname: servicemonitor.yml + object_app: bodhi + object_file: servicemonitor.yml + object_objectname: servicemonitor.yml when: env != "production" - role: openshift/object - app: bodhi - file: podmonitor.yml - objectname: podmonitor.yml + object_app: bodhi + object_file: podmonitor.yml + object_objectname: podmonitor.yml when: env != "production" - role: openshift/route app: bodhi @@ -135,13 +135,13 @@ annotations: haproxy.router.openshift.io/timeout: 180s - role: openshift/object - app: bodhi - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: bodhi + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: bodhi - template: critpathcron.yml - objectname: critpathcron.yml + object_app: bodhi + object_template: critpathcron.yml + object_objectname: critpathcron.yml - role: openshift/imagestream app: bodhi imagename: bodhi-critpathcron diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index 348fda3bac..d4c5caf7f2 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml @@ -70,16 +70,16 @@ imagename: bugzilla2fedmsg - role: openshift/object - app: bugzilla2fedmsg - template: buildconfig.yml - objectname: buildconfig.yml + object_app: bugzilla2fedmsg + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: bugzilla2fedmsg - template: configmap.yml - objectname: configmap.yml + object_app: bugzilla2fedmsg + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: bugzilla2fedmsg - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: bugzilla2fedmsg + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml index 86c10b74f6..d3c377f806 100644 --- a/playbooks/openshift-apps/cloud-image-uploader.yml +++ b/playbooks/openshift-apps/cloud-image-uploader.yml @@ -30,19 +30,19 @@ - jcline - role: openshift/object - app: cloud-image-uploader - file: imagestream.yml - objectname: imagestream.yml + object_app: cloud-image-uploader + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: cloud-image-uploader - template: buildconfig.yml - objectname: buildconfig.yml + object_app: cloud-image-uploader + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: cloud-image-uploader - template: configmap.yml - objectname: configmap.yml + object_app: cloud-image-uploader + object_template: configmap.yml + object_objectname: configmap.yml vars: azure_image_regions: - "australiaeast" @@ -107,19 +107,19 @@ privatefile: "docker-registry/{{env}}/pki/private/containerstable.key" - role: openshift/object - app: cloud-image-uploader - template: secret.yml - objectname: secret.yml + object_app: cloud-image-uploader + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: cloud-image-uploader - template: aws-secrets.yml - objectname: aws-secrets.yml + object_app: cloud-image-uploader + object_template: aws-secrets.yml + object_objectname: aws-secrets.yml - role: openshift/object - app: cloud-image-uploader - template: container-secrets.yml - objectname: container-secrets.yml + object_app: cloud-image-uploader + object_template: container-secrets.yml + object_objectname: container-secrets.yml - role: openshift/start-build app: cloud-image-uploader @@ -127,6 +127,6 @@ objectname: cloud-image-uploader-build - role: openshift/object - app: cloud-image-uploader - template: deployment.yml - objectname: deployment.yml + object_app: cloud-image-uploader + object_template: deployment.yml + object_objectname: deployment.yml diff --git a/playbooks/openshift-apps/compose-tracker.yml b/playbooks/openshift-apps/compose-tracker.yml index a7e2806236..a424091ce2 100644 --- a/playbooks/openshift-apps/compose-tracker.yml +++ b/playbooks/openshift-apps/compose-tracker.yml @@ -21,19 +21,19 @@ - appowner - role: openshift/object - app: compose-tracker - template: secret.yml - objectname: secret.yml + object_app: compose-tracker + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: compose-tracker - template: imagestream.yml - objectname: imagestream.yml + object_app: compose-tracker + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: compose-tracker - template: buildconfig.yml - objectname: buildconfig.yml + object_app: compose-tracker + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: compose-tracker @@ -41,9 +41,9 @@ objectname: compose-tracker-build - role: openshift/object - app: compose-tracker - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: compose-tracker + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: compose-tracker diff --git a/playbooks/openshift-apps/coreos-cincinnati.yml b/playbooks/openshift-apps/coreos-cincinnati.yml index 686a45f5df..cb9bde8b20 100644 --- a/playbooks/openshift-apps/coreos-cincinnati.yml +++ b/playbooks/openshift-apps/coreos-cincinnati.yml @@ -30,29 +30,29 @@ - siosm - role: openshift/object - app: coreos-cincinnati - template: imagestream.yml - objectname: imagestream.yml + object_app: coreos-cincinnati + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: coreos-cincinnati - template: buildconfig.yml - objectname: buildconfig.yml + object_app: coreos-cincinnati + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build - app: coreos-cincinnati - buildname: coreos-cincinnati-build - objectname: coreos-cincinnati-build + object_app: coreos-cincinnati + object_buildname: coreos-cincinnati-build + object_objectname: coreos-cincinnati-build - role: openshift/object - app: coreos-cincinnati - template: config-stub.yml - objectname: config-stub.yml + object_app: coreos-cincinnati + object_template: config-stub.yml + object_objectname: config-stub.yml - role: openshift/object - app: coreos-cincinnati - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: coreos-cincinnati + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: coreos-cincinnati @@ -60,14 +60,14 @@ tags: [never, rollout] - role: openshift/object - app: coreos-cincinnati - template: service.yml - objectname: service.yml + object_app: coreos-cincinnati + object_template: service.yml + object_objectname: service.yml - role: openshift/object - app: coreos-cincinnati - template: servicemonitor.yml - objectname: servicemonitor.yml + object_app: coreos-cincinnati + object_template: servicemonitor.yml + object_objectname: servicemonitor.yml - role: openshift/route app: coreos-cincinnati diff --git a/playbooks/openshift-apps/coreos-koji-tagger.yml b/playbooks/openshift-apps/coreos-koji-tagger.yml index b6db088da5..5121cf07e7 100644 --- a/playbooks/openshift-apps/coreos-koji-tagger.yml +++ b/playbooks/openshift-apps/coreos-koji-tagger.yml @@ -35,19 +35,19 @@ # Copy in a kerberos config that is unique to fedora infra - role: openshift/object - app: coreos-koji-tagger - template: configmap.yml - objectname: configmap.yml + object_app: coreos-koji-tagger + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: coreos-koji-tagger - template: imagestream.yml - objectname: imagestream.yml + object_app: coreos-koji-tagger + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: coreos-koji-tagger - template: buildconfig.yml - objectname: buildconfig.yml + object_app: coreos-koji-tagger + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: coreos-koji-tagger @@ -55,9 +55,9 @@ objectname: coreos-koji-tagger-build - role: openshift/object - app: coreos-koji-tagger - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: coreos-koji-tagger + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/coreos-ostree-importer.yml b/playbooks/openshift-apps/coreos-ostree-importer.yml index f28c77dc04..708f8d0b96 100644 --- a/playbooks/openshift-apps/coreos-ostree-importer.yml +++ b/playbooks/openshift-apps/coreos-ostree-importer.yml @@ -71,29 +71,29 @@ # Fedora Messaging config - role: openshift/object - app: coreos-ostree-importer - template: configmap.yml - objectname: configmap.yml + object_app: coreos-ostree-importer + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: coreos-ostree-importer - template: imagestream.yml - objectname: imagestream.yml + object_app: coreos-ostree-importer + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: coreos-ostree-importer - template: buildconfig.yml - objectname: buildconfig.yml + object_app: coreos-ostree-importer + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: coreos-ostree-importer - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: coreos-ostree-importer + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: coreos-ostree-importer - template: pvc.yml - objectname: pvc.yml + object_app: coreos-ostree-importer + object_template: pvc.yml + object_objectname: pvc.yml ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/custom-error-pages.yml b/playbooks/openshift-apps/custom-error-pages.yml index 60fb74d8dd..b11688a5c4 100644 --- a/playbooks/openshift-apps/custom-error-pages.yml +++ b/playbooks/openshift-apps/custom-error-pages.yml @@ -20,9 +20,9 @@ roles: - role: openshift/object - app: openshift-config - objectname: error-code-pages.yml - template: error-code-pages.yml + object_app: openshift-config + object_objectname: error-code-pages.yml + object_template: error-code-pages.yml post_tasks: - name: Patch ingress controller with custom error pages diff --git a/playbooks/openshift-apps/datagrepper.yml b/playbooks/openshift-apps/datagrepper.yml index 9c05ef9647..1fcbc15e48 100644 --- a/playbooks/openshift-apps/datagrepper.yml +++ b/playbooks/openshift-apps/datagrepper.yml @@ -61,24 +61,24 @@ when: env == "staging" - role: openshift/object - app: datagrepper - file: imagestream.yml - objectname: imagestream.yml + object_app: datagrepper + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: datagrepper - template: buildconfig.yml - objectname: buildconfig.yml + object_app: datagrepper + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: datagrepper - template: configmap.yml - objectname: configmap.yml + object_app: datagrepper + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: datagrepper - template: service.yml - objectname: service.yml + object_app: datagrepper + object_template: service.yml + object_objectname: service.yml - role: openshift/route app: datagrepper @@ -91,14 +91,14 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: datagrepper - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: datagrepper + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml - role: openshift/object - app: datagrepper - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: datagrepper + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # - role: openshift/start-build # app: datagrepper diff --git a/playbooks/openshift-apps/datanommer.yml b/playbooks/openshift-apps/datanommer.yml index e6d13b10cf..cc6a1700d8 100644 --- a/playbooks/openshift-apps/datanommer.yml +++ b/playbooks/openshift-apps/datanommer.yml @@ -64,21 +64,21 @@ privatefile: "rabbitmq/{{env}}/pki/private/datanommer{{env_suffix}}.key" - role: openshift/object - app: datanommer - file: imagestream.yml - objectname: imagestream.yml + object_app: datanommer + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: datanommer - template: buildconfig.yml - objectname: buildconfig.yml + object_app: datanommer + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: datanommer - template: configmap.yml - objectname: configmap.yml + object_app: datanommer + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: datanommer - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: datanommer + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 75b79471fe..25b213b6d5 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -45,19 +45,19 @@ imagename: discourse2fedmsg - role: openshift/object - app: discourse2fedmsg - template: buildconfig.yml - objectname: buildconfig.yml + object_app: discourse2fedmsg + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: discourse2fedmsg - template: configmap.yml - objectname: configmap.yml + object_app: discourse2fedmsg + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: discourse2fedmsg - file: service.yml - objectname: service.yml + object_app: discourse2fedmsg + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: discourse2fedmsg @@ -67,9 +67,9 @@ servicename: discourse2fedmsg-web - role: openshift/object - app: discourse2fedmsg - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: discourse2fedmsg + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # - role: openshift/start-build # app: discourse2fedmsg diff --git a/playbooks/openshift-apps/docsbuilding.yml b/playbooks/openshift-apps/docsbuilding.yml index bdc0021f90..56fecd36ec 100644 --- a/playbooks/openshift-apps/docsbuilding.yml +++ b/playbooks/openshift-apps/docsbuilding.yml @@ -33,32 +33,32 @@ imagename: builder - role: openshift/object - app: docsbuilding - objectname: buildconfig.yml - template: buildconfig.yml + object_app: docsbuilding + object_objectname: buildconfig.yml + object_template: buildconfig.yml - role: openshift/start-build app: docsbuilding buildname: builder-build - role: openshift/object - app: docsbuilding - template: cron.yml - objectname: cron.yml + object_app: docsbuilding + object_template: cron.yml + object_objectname: cron.yml tags: - deploy-cronjob - role: openshift/object - app: docsbuilding - template: cron-translated.yml - objectname: cron-translated.yml + object_app: docsbuilding + object_template: cron-translated.yml + object_objectname: cron-translated.yml tags: - deploy-cronjob - role: openshift/object - app: docsbuilding - file: pvc.yml - objectname: pvc.yml + object_app: docsbuilding + object_file: pvc.yml + object_objectname: pvc.yml ############################################### diff --git a/playbooks/openshift-apps/docstranslation.yml b/playbooks/openshift-apps/docstranslation.yml index a29b18f8bb..a267fbb3d2 100644 --- a/playbooks/openshift-apps/docstranslation.yml +++ b/playbooks/openshift-apps/docstranslation.yml @@ -35,8 +35,8 @@ ansible.builtin.include_role: name: openshift/object vars: - objectname: buildconfig.yml - template: buildconfig.yml + object_objectname: buildconfig.yml + object_template: buildconfig.yml - name: Start build ansible.builtin.include_role: @@ -48,8 +48,8 @@ ansible.builtin.include_role: name: openshift/object vars: - objectname: secrets.yml - template: secrets.yml + object_objectname: secrets.yml + object_template: secrets.yml tags: - deploy-secrets @@ -57,8 +57,8 @@ ansible.builtin.include_role: name: openshift/object vars: - objectname: configmap.yml - template: configmap.yml + object_objectname: configmap.yml + object_template: configmap.yml tags: - deploy-config @@ -66,8 +66,8 @@ ansible.builtin.include_role: name: openshift/object vars: - template: cron.yml - objectname: cron.yml + object_template: cron.yml + object_objectname: cron.yml tags: - deploy-cronjob diff --git a/playbooks/openshift-apps/easyfix.yml b/playbooks/openshift-apps/easyfix.yml index a5979ff186..8e7cd47f31 100644 --- a/playbooks/openshift-apps/easyfix.yml +++ b/playbooks/openshift-apps/easyfix.yml @@ -25,29 +25,29 @@ - apply-appowners - role: openshift/object - app: easyfix - file: imagestream.yml - objectname: imagestream.yml + object_app: easyfix + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: easyfix - template: buildconfig.yml - objectname: buildconfig.yml + object_app: easyfix + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: easyfix - file: storage.yml - objectname: storage.yml + object_app: easyfix + object_file: storage.yml + object_objectname: storage.yml - role: openshift/object - app: easyfix - template: configmap.yml - objectname: configmap.yml + object_app: easyfix + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: easyfix - file: service.yml - objectname: service.yml + object_app: easyfix + object_file: service.yml + object_objectname: service.yml # Routes - role: openshift/route @@ -60,12 +60,12 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: easyfix - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: easyfix + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # Cron jobs - role: openshift/object - app: easyfix - template: cron.yml - objectname: cron.yml + object_app: easyfix + object_template: cron.yml + object_objectname: cron.yml diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index 8718274dd8..08c435066a 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/playbooks/openshift-apps/elections.yml @@ -55,14 +55,14 @@ app: elections - role: openshift/object - app: elections - template: imagestream.yml - objectname: imagestream.yml + object_app: elections + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: elections - template: buildconfig.yml - objectname: buildconfig.yml + object_app: elections + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/secret-file app: elections @@ -83,14 +83,14 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: elections - template: secret.yml - objectname: secret.yml + object_app: elections + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: elections - template: configmap.yml - objectname: configmap.yml + object_app: elections + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/start-build app: elections @@ -98,9 +98,9 @@ objectname: elections-build - role: openshift/object - app: elections - file: service.yml - objectname: service.yml + object_app: elections + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: elections @@ -110,6 +110,6 @@ servicename: elections - role: openshift/object - app: elections - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: elections + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index ef8405d3de..f2972fad17 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -74,22 +74,22 @@ imagename: fasjson - role: openshift/object - app: fasjson - template: buildconfig.yml - objectname: buildconfig.yml + object_app: fasjson + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: fasjson - template: configmap.yml - objectname: configmap.yml + object_app: fasjson + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/ipa-client app: fasjson - role: openshift/object - app: fasjson - file: service.yml - objectname: service.yml + object_app: fasjson + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: fasjson @@ -101,14 +101,14 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: fasjson - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: fasjson + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml - role: openshift/object - app: fasjson - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: fasjson + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # - role: openshift/start-build # app: fasjson diff --git a/playbooks/openshift-apps/fedocal.yml b/playbooks/openshift-apps/fedocal.yml index f413783b5f..3d97cd14f9 100644 --- a/playbooks/openshift-apps/fedocal.yml +++ b/playbooks/openshift-apps/fedocal.yml @@ -21,14 +21,14 @@ - kevin - role: openshift/object - app: fedocal - template: imagestream.yml - objectname: imagestream.yml + object_app: fedocal + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: fedocal - template: buildconfig.yml - objectname: buildconfig.yml + object_app: fedocal + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/secret-file app: fedocal @@ -49,14 +49,14 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: fedocal - template: secret.yml - objectname: secret.yml + object_app: fedocal + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: fedocal - template: configmap.yml - objectname: configmap.yml + object_app: fedocal + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/start-build app: fedocal @@ -64,9 +64,9 @@ objectname: fedocal-build - role: openshift/object - app: fedocal - file: service.yml - objectname: service.yml + object_app: fedocal + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: fedocal @@ -76,12 +76,12 @@ servicename: fedocal - role: openshift/object - app: fedocal - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: fedocal + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: fedocal - file: cron.yml - objectname: cron.yml + object_app: fedocal + object_file: cron.yml + object_objectname: cron.yml when: env != 'staging' diff --git a/playbooks/openshift-apps/fedora-ostree-pruner.yml b/playbooks/openshift-apps/fedora-ostree-pruner.yml index d666ffe948..1ca1cf0bc5 100644 --- a/playbooks/openshift-apps/fedora-ostree-pruner.yml +++ b/playbooks/openshift-apps/fedora-ostree-pruner.yml @@ -23,24 +23,24 @@ - kevin - role: openshift/object - app: fedora-ostree-pruner - template: imagestream.yml - objectname: imagestream.yml + object_app: fedora-ostree-pruner + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: fedora-ostree-pruner - template: buildconfig.yml - objectname: buildconfig.yml + object_app: fedora-ostree-pruner + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: fedora-ostree-pruner - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: fedora-ostree-pruner + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: fedora-ostree-pruner - template: pvc.yml - objectname: pvc.yml + object_app: fedora-ostree-pruner + object_template: pvc.yml + object_objectname: pvc.yml ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/fedora-packages-static.yml b/playbooks/openshift-apps/fedora-packages-static.yml index 39ebb716b4..c6f18be0aa 100644 --- a/playbooks/openshift-apps/fedora-packages-static.yml +++ b/playbooks/openshift-apps/fedora-packages-static.yml @@ -18,24 +18,24 @@ - kevin - role: openshift/object - app: fedora-packages-static - file: imagestream.yml - objectname: imagestream.yml + object_app: fedora-packages-static + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: fedora-packages-static - template: buildconfig.yml - objectname: buildconfig.yml + object_app: fedora-packages-static + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: fedora-packages-static - template: storage.yml - objectname: storage.yml + object_app: fedora-packages-static + object_template: storage.yml + object_objectname: storage.yml - role: openshift/object - app: fedora-packages-static - template: configmap.yml - objectname: configmap.yml + object_app: fedora-packages-static + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/start-build app: fedora-packages-static @@ -43,9 +43,9 @@ objectname: fedora-packages-static-build - role: openshift/object - app: fedora-packages-static - file: service.yml - objectname: service.yml + object_app: fedora-packages-static + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: fedora-packages-static @@ -55,9 +55,9 @@ servicename: fedora-packages-static - role: openshift/object - app: fedora-packages-static - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: fedora-packages-static + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/flask-oidc-dev.yml b/playbooks/openshift-apps/flask-oidc-dev.yml index 37b97e10c7..aeebda65af 100644 --- a/playbooks/openshift-apps/flask-oidc-dev.yml +++ b/playbooks/openshift-apps/flask-oidc-dev.yml @@ -28,19 +28,19 @@ imagename: flask-oidc-dev - role: openshift/object - app: flask-oidc-dev - template: buildconfig.yml - objectname: buildconfig.yml + object_app: flask-oidc-dev + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: flask-oidc-dev - template: configmap.yml - objectname: configmap.yml + object_app: flask-oidc-dev + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: flask-oidc-dev - file: service.yml - objectname: service.yml + object_app: flask-oidc-dev + object_file: service.yml + object_objectname: service.yml # - role: openshift/route # app: test-auth @@ -63,11 +63,11 @@ when: ocp4 - role: openshift/object - app: flask-oidc-dev - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: flask-oidc-dev + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml - role: openshift/object - app: flask-oidc-dev - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: flask-oidc-dev + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/flatpak-indexer.yml b/playbooks/openshift-apps/flatpak-indexer.yml index a0f72afaba..69b292dd18 100644 --- a/playbooks/openshift-apps/flatpak-indexer.yml +++ b/playbooks/openshift-apps/flatpak-indexer.yml @@ -20,29 +20,29 @@ - kalev - role: openshift/object - app: flatpak-indexer - template: secret.yml - objectname: secret.yml + object_app: flatpak-indexer + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: flatpak-indexer - file: imagestream.yml - objectname: imagestream.yml + object_app: flatpak-indexer + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: flatpak-indexer - template: buildconfig.yml - objectname: buildconfig.yml + object_app: flatpak-indexer + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: flatpak-indexer - template: storage.yml - objectname: storage.yml + object_app: flatpak-indexer + object_template: storage.yml + object_objectname: storage.yml - role: openshift/object - app: flatpak-indexer - template: configmap.yml - objectname: configmap.yml + object_app: flatpak-indexer + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/start-build app: flatpak-indexer @@ -50,11 +50,11 @@ buildname: flatpak-indexer-tardiff-build - role: openshift/object - app: flatpak-indexer - file: service.yml - objectname: service.yml + object_app: flatpak-indexer + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: flatpak-indexer - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: flatpak-indexer + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index 2295ed9bb6..c26fae8e62 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/playbooks/openshift-apps/fmn.yml @@ -124,24 +124,24 @@ - apply-appowners - role: openshift/object - app: fmn - file: imagestream.yml - objectname: imagestream.yml + object_app: fmn + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: fmn - template: buildconfig.yml - objectname: buildconfig.yml + object_app: fmn + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: fmn - template: configmap.yml - objectname: configmap.yml + object_app: fmn + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: fmn - file: service.yml - objectname: service.yml + object_app: fmn + object_file: service.yml + object_objectname: service.yml # Routes - role: openshift/route @@ -173,14 +173,14 @@ # Secrets - role: openshift/object - app: fmn - template: secrets.yml - objectname: secrets.yml + object_app: fmn + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: fmn - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: fmn + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml # Fedora Messaging - role: openshift/secret-file @@ -201,9 +201,9 @@ # Deployment config - role: openshift/object - app: fmn - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: fmn + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # FASJSON access - role: openshift/ipa-client @@ -216,6 +216,6 @@ # Cron jobs - role: openshift/object - app: fmn - template: cron.yml - objectname: cron.yml + object_app: fmn + object_template: cron.yml + object_objectname: cron.yml diff --git a/playbooks/openshift-apps/greenwave.yml b/playbooks/openshift-apps/greenwave.yml index 28dd7977c6..1d377f5e75 100644 --- a/playbooks/openshift-apps/greenwave.yml +++ b/playbooks/openshift-apps/greenwave.yml @@ -52,19 +52,19 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: greenwave - template: imagestream.yml - objectname: imagestream.yml + object_app: greenwave + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: greenwave - template: configmap.yml - objectname: configmap.yml + object_app: greenwave + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: greenwave - file: service.yml - objectname: service.yml + object_app: greenwave + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: greenwave @@ -75,14 +75,14 @@ # TODO -- someday retire this old route in favor of the pretty one above. - role: openshift/object - app: greenwave - file: route.yml - objectname: route.yml + object_app: greenwave + object_file: route.yml + object_objectname: route.yml - role: openshift/object - app: greenwave - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: greenwave + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml tags: - apply-deploymentconfig diff --git a/playbooks/openshift-apps/ipsilon-website.yml b/playbooks/openshift-apps/ipsilon-website.yml index ed4dc870e7..38c4154d1e 100644 --- a/playbooks/openshift-apps/ipsilon-website.yml +++ b/playbooks/openshift-apps/ipsilon-website.yml @@ -25,14 +25,14 @@ imagename: ipsilon-website - role: openshift/object - app: ipsilon-website - template: buildconfig.yml - objectname: buildconfig.yml + object_app: ipsilon-website + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: ipsilon-website - file: service.yml - objectname: service.yml + object_app: ipsilon-website + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: ipsilon-website @@ -53,6 +53,6 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: ipsilon-website - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: ipsilon-website + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/kanban.yml b/playbooks/openshift-apps/kanban.yml index f9255dfa0d..2fc926f854 100644 --- a/playbooks/openshift-apps/kanban.yml +++ b/playbooks/openshift-apps/kanban.yml @@ -87,34 +87,34 @@ - apply-appowners - role: openshift/object - app: kanban - template: buildconfig.yml - objectname: buildconfig.yml + object_app: kanban + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: kanban - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: kanban + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: kanban - template: imagestream.yml - objectname: imagestream.yml + object_app: kanban + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: kanban - file: service.yml - objectname: service.yml + object_app: kanban + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: kanban - template: secret.yml - objectname: secret.yml + object_app: kanban + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: kanban - template: cron.yml - objectname: cron.yml + object_app: kanban + object_template: cron.yml + object_objectname: cron.yml - role: openshift/route app: kanban diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index 3557cf19bf..c467ae8080 100644 --- a/playbooks/openshift-apps/kerneltest.yml +++ b/playbooks/openshift-apps/kerneltest.yml @@ -69,29 +69,29 @@ privatefile: "rabbitmq/{{env}}/pki/private/kerneltest{{env_suffix}}.key" - role: openshift/object - app: kerneltest - file: imagestream.yml - objectname: imagestream.yml + object_app: kerneltest + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: kerneltest - template: buildconfig.yml - objectname: buildconfig.yml + object_app: kerneltest + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: kerneltest - file: storage.yml - objectname: storage.yml + object_app: kerneltest + object_file: storage.yml + object_objectname: storage.yml - role: openshift/object - app: kerneltest - file: service.yml - objectname: service.yml + object_app: kerneltest + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: kerneltest - template: configmap.yml - objectname: configmap.yml + object_app: kerneltest + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/ipa-client app: kerneltest @@ -106,6 +106,6 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: kerneltest - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: kerneltest + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index 0a4be7d2e9..979582df56 100644 --- a/playbooks/openshift-apps/koschei.yml +++ b/playbooks/openshift-apps/koschei.yml @@ -41,8 +41,8 @@ ansible.builtin.include_role: name: openshift/object vars: - template: "{{ item }}.yml" - objectname: "{{ item }}.yml" + object_template: "{{ item }}.yml" + object_objectname: "{{ item }}.yml" with_items: - imagestream - frontend-config @@ -56,13 +56,13 @@ ansible.builtin.include_role: name: openshift/object vars: - template: backend-deployment.yml - objectname: "{{ item.name }}-deployment.yml" - service: "{{ item.name }}" - min_cpu: "{{ item.cpu[0] }}" - max_cpu: "{{ item.cpu[1] }}" - min_mem: "{{ item.memory[0] }}" - max_mem: "{{ item.memory[1] }}" + object_template: backend-deployment.yml + object_objectname: "{{ item.name }}-deployment.yml" + object_service: "{{ item.name }}" + object_min_cpu: "{{ item.cpu[0] }}" + object_max_cpu: "{{ item.cpu[1] }}" + object_min_mem: "{{ item.memory[0] }}" + object_max_mem: "{{ item.memory[1] }}" with_items: "{{ koschei_backend_services }}" loop_control: label: "{{ item.name }}" @@ -71,11 +71,11 @@ ansible.builtin.include_role: name: openshift/object vars: - template: cronjob.yml - objectname: "{{ item.name }}-cronjob.yml" - name: "{{ item.name }}" - schedule: "{{ item.schedule }}" - command: "{{ item.command }}" + object_template: cronjob.yml + object_objectname: "{{ item.name }}-cronjob.yml" + object_name: "{{ item.name }}" + object_schedule: "{{ item.schedule }}" + object_command: "{{ item.command }}" with_items: "{{ koschei_cron_jobs }}" loop_control: label: "{{ item.name }}" diff --git a/playbooks/openshift-apps/languages.yml b/playbooks/openshift-apps/languages.yml index 208acd8eb8..3daebb2187 100644 --- a/playbooks/openshift-apps/languages.yml +++ b/playbooks/openshift-apps/languages.yml @@ -18,23 +18,23 @@ - jibecfed - role: openshift/object - app: languages - objectname: imagestream.yml - template: imagestream.yml + object_app: languages + object_objectname: imagestream.yml + object_template: imagestream.yml - role: openshift/object - app: languages - objectname: buildconfig.yml - template: buildconfig.yml + object_app: languages + object_objectname: buildconfig.yml + object_template: buildconfig.yml - role: openshift/start-build app: languages buildname: build-latest - role: openshift/object - app: languages - template: service.yml - objectname: service.yml + object_app: languages + object_template: service.yml + object_objectname: service.yml - role: openshift/route app: languages @@ -44,19 +44,19 @@ servicename: web - role: openshift/object - app: languages - template: pvc.yml - objectname: pvc.yml + object_app: languages + object_template: pvc.yml + object_objectname: pvc.yml - role: openshift/object - app: languages - template: deployment.yml - objectname: deployment.yml + object_app: languages + object_template: deployment.yml + object_objectname: deployment.yml - role: openshift/object - app: languages - template: cron.yml - objectname: cron.yml + object_app: languages + object_template: cron.yml + object_objectname: cron.yml ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index 2a3144c013..705892ac2c 100644 --- a/playbooks/openshift-apps/maubot.yml +++ b/playbooks/openshift-apps/maubot.yml @@ -53,24 +53,24 @@ app: maubot - role: openshift/object - app: maubot - file: imagestream.yml - objectname: imagestream.yml + object_app: maubot + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: maubot - template: buildconfig.yml - objectname: buildconfig.yml + object_app: maubot + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: maubot - template: meetbot-logs-volume.yml - objectname: meetbot-logs-volume.yml + object_app: maubot + object_template: meetbot-logs-volume.yml + object_objectname: meetbot-logs-volume.yml - role: openshift/object - app: maubot - template: configmap.yml - objectname: configmap.yml + object_app: maubot + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/secret-file app: maubot @@ -96,9 +96,9 @@ objectname: maubot-build - role: openshift/object - app: maubot - file: service.yml - objectname: service.yml + object_app: maubot + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: maubot @@ -108,9 +108,9 @@ servicename: maubot - role: openshift/object - app: maubot - file: deployment.yml - objectname: deployment.yml + object_app: maubot + object_file: deployment.yml + object_objectname: deployment.yml ############################################### # actions to delete the project from OpenShift diff --git a/playbooks/openshift-apps/mdapi.yml b/playbooks/openshift-apps/mdapi.yml index d1d90f2afb..963b395798 100644 --- a/playbooks/openshift-apps/mdapi.yml +++ b/playbooks/openshift-apps/mdapi.yml @@ -22,24 +22,24 @@ - kevin - role: openshift/object - app: mdapi - template: imagestream.yml - objectname: imagestream.yml + object_app: mdapi + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: mdapi - template: buildconfig.yml - objectname: buildconfig.yml + object_app: mdapi + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: mdapi - file: storage.yml - objectname: storage.yml + object_app: mdapi + object_file: storage.yml + object_objectname: storage.yml - role: openshift/object - app: mdapi - template: configmap.yml - objectname: configmap.yml + object_app: mdapi + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/secret-file app: mdapi @@ -60,9 +60,9 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: mdapi - file: cron.yml - objectname: cron.yml + object_app: mdapi + object_file: cron.yml + object_objectname: cron.yml tags: - cron-job @@ -72,9 +72,9 @@ objectname: mdapi-build - role: openshift/object - app: mdapi - file: service.yml - objectname: service.yml + object_app: mdapi + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: mdapi @@ -84,9 +84,9 @@ servicename: mdapi - role: openshift/object - app: mdapi - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: mdapi + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: mdapi diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index f19ea14f79..ec446c23a6 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -123,30 +123,30 @@ privatefile: "rabbitmq/{{env}}/pki/issued/messaging-bridge{{env_suffix}}.fedoraproject.org.crt" - role: openshift/object - app: messaging-bridges - file: imagestream.yml - objectname: imagestream.yml + object_app: messaging-bridges + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: messaging-bridges - template: buildconfig.yml - objectname: buildconfig.yml + object_app: messaging-bridges + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: messaging-bridges buildname: messaging-bridges-build - role: openshift/object - app: messaging-bridges - template: configmap.yml - objectname: configmap.yml + object_app: messaging-bridges + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: messaging-bridges - file: service.yml - objectname: service.yml + object_app: messaging-bridges + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: messaging-bridges - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: messaging-bridges + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: messaging-bridges diff --git a/playbooks/openshift-apps/mirrormanager.yml b/playbooks/openshift-apps/mirrormanager.yml index 37e5a71765..7275ebffd5 100644 --- a/playbooks/openshift-apps/mirrormanager.yml +++ b/playbooks/openshift-apps/mirrormanager.yml @@ -57,34 +57,34 @@ - apply-appowners - role: openshift/object - app: mirrormanager - file: imagestream.yml - objectname: imagestream.yml + object_app: mirrormanager + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: mirrormanager - template: buildconfig.yml - objectname: buildconfig.yml + object_app: mirrormanager + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: mirrormanager - file: storage.yml - objectname: storage.yml + object_app: mirrormanager + object_file: storage.yml + object_objectname: storage.yml - role: openshift/object - app: mirrormanager - template: secrets.yml - objectname: secrets.yml + object_app: mirrormanager + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: mirrormanager - template: configmap.yml - objectname: configmap.yml + object_app: mirrormanager + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: mirrormanager - file: service.yml - objectname: service.yml + object_app: mirrormanager + object_file: service.yml + object_objectname: service.yml # Routes - role: openshift/route @@ -132,37 +132,37 @@ # Deployment config - role: openshift/object - app: mirrormanager - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: mirrormanager + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # Cron jobs - role: openshift/object - app: mirrormanager - template: cron-crawler.yml - objectname: cron-crawler.yml + object_app: mirrormanager + object_template: cron-crawler.yml + object_objectname: cron-crawler.yml when: env == "production" - role: openshift/object - app: mirrormanager - template: cron-propagation.yml - objectname: cron-propagation.yml + object_app: mirrormanager + object_template: cron-propagation.yml + object_objectname: cron-propagation.yml when: env == "production" - role: openshift/object - app: mirrormanager - template: cron-accesses.yml - objectname: cron-accesses.yml + object_app: mirrormanager + object_template: cron-accesses.yml + object_objectname: cron-accesses.yml - role: openshift/object - app: mirrormanager - template: cron-mirrorlist-cache.yml - objectname: cron-mirrorlist-cache.yml + object_app: mirrormanager + object_template: cron-mirrorlist-cache.yml + object_objectname: cron-mirrorlist-cache.yml - role: openshift/object - app: mirrormanager - template: cron-geoip.yml - objectname: cron-geoip.yml + object_app: mirrormanager + object_template: cron-geoip.yml + object_objectname: cron-geoip.yml - role: openshift/object - app: mirrormanager - template: cron-primary-mirror.yml - objectname: cron-primary-mirror.yml + object_app: mirrormanager + object_template: cron-primary-mirror.yml + object_objectname: cron-primary-mirror.yml - role: openshift/start-build app: mirrormanager diff --git a/playbooks/openshift-apps/monitor_dashboard.yml b/playbooks/openshift-apps/monitor_dashboard.yml index 2701c1dd78..b548df05e9 100644 --- a/playbooks/openshift-apps/monitor_dashboard.yml +++ b/playbooks/openshift-apps/monitor_dashboard.yml @@ -20,105 +20,105 @@ - asaleh # - role: openshift/object -# app: monitor-dashboard -# template: configmap.yml -# objectname: configmap.yml +# object_app: monitor-dashboard +# object_template: configmap.yml +# object_objectname: configmap.yml # - role: openshift/object -# app: monitor-dashboard -# file: notifiers.yaml -# objectname: notifiers.yml +# object_app: monitor-dashboard +# object_file: notifiers.yaml +# object_objectname: notifiers.yml # - role: openshift/object -# app: monitor-dashboard -# file: dashboard_provision_config.yml -# objectname: dashboard_provision_config.yml +# object_app: monitor-dashboard +# object_file: dashboard_provision_config.yml +# object_objectname: dashboard_provision_config.yml # - role: openshift/object -# app: monitor-dashboard -# template: dashboard_config.yml -# objectname: dashboard_config.yml +# object_app: monitor-dashboard +# object_template: dashboard_config.yml +# object_objectname: dashboard_config.yml # - role: openshift/object -# app: monitor-dashboard -# template: buildconfig.yml -# objectname: buildconfig.yml +# object_app: monitor-dashboard +# object_template: buildconfig.yml +# object_objectname: buildconfig.yml # - role: openshift/object -# app: monitor-dashboard -# file: imagestream.yml -# objectname: imagestream.yml +# object_app: monitor-dashboard +# object_file: imagestream.yml +# object_objectname: imagestream.yml # - role: openshift/object -# app: monitor-dashboard -# template: datagrepper_configmap.yml -# objectname: datagrepper_configmap.yml +# object_app: monitor-dashboard +# object_template: datagrepper_configmap.yml +# object_objectname: datagrepper_configmap.yml - role: openshift/object - app: monitor-dashboard - file: service.yml - objectname: service.yml + object_app: monitor-dashboard + object_file: service.yml + object_objectname: service.yml # - role: openshift/object -# app: monitor-dashboard -# file: datagrepper_service.yml -# objectname: datagrepper_service.yml +# object_app: monitor-dashboard +# object_file: datagrepper_service.yml +# object_objectname: datagrepper_service.yml # - role: openshift/object -# app: monitor-dashboard -# file: postgrest_service.yml -# objectname: postgrest_service.yml +# object_app: monitor-dashboard +# object_file: postgrest_service.yml +# object_objectname: postgrest_service.yml # - role: openshift/object -# app: monitor-dashboard -# file: prest_service.yml -# objectname: prest_service.yml +# object_app: monitor-dashboard +# object_file: prest_service.yml +# object_objectname: prest_service.yml - role: openshift/object - app: monitor-dashboard - file: route_serviceaccount.yml - objectname: route_serviceaccount.yml + object_app: monitor-dashboard + object_file: route_serviceaccount.yml + object_objectname: route_serviceaccount.yml # Route already present, will figure updating later - role: openshift/object - app: monitor-dashboard - file: route.yml - objectname: route.yml + object_app: monitor-dashboard + object_file: route.yml + object_objectname: route.yml # - role: openshift/object -# app: monitor-dashboard -# file: datagrepper_route.yml -# objectname: datagrepper_route.yml +# object_app: monitor-dashboard +# object_file: datagrepper_route.yml +# object_objectname: datagrepper_route.yml # - role: openshift/object -# app: monitor-dashboard -# file: postgrest_route.yml -# objectname: postgrest_route.yml +# object_app: monitor-dashboard +# object_file: postgrest_route.yml +# object_objectname: postgrest_route.yml # - role: openshift/object -# app: monitor-dashboard -# file: prest_route.yml -# objectname: prest_route.yml +# object_app: monitor-dashboard +# object_file: prest_route.yml +# object_objectname: prest_route.yml # - role: openshift/object -# app: monitor-dashboard -# template: postgrest_deploymentconfig.yml -# objectname: postgrest_deploymentconfig.yml +# object_app: monitor-dashboard +# object_template: postgrest_deploymentconfig.yml +# object_objectname: postgrest_deploymentconfig.yml # - role: openshift/object -# app: monitor-dashboard -# template: prest_deploymentconfig.yml -# objectname: prest_deploymentconfig.yml +# object_app: monitor-dashboard +# object_template: prest_deploymentconfig.yml +# object_objectname: prest_deploymentconfig.yml # - role: openshift/object -# app: monitor-dashboard -# template: datagrepper_deploymentconfig.yml -# objectname: datagrepper_deploymentconfig.yml +# object_app: monitor-dashboard +# object_template: datagrepper_deploymentconfig.yml +# object_objectname: datagrepper_deploymentconfig.yml - role: openshift/object - app: monitor-dashboard - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: monitor-dashboard + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/monitor_gating.yml b/playbooks/openshift-apps/monitor_gating.yml index c1937d6f4e..252f7c8065 100644 --- a/playbooks/openshift-apps/monitor_gating.yml +++ b/playbooks/openshift-apps/monitor_gating.yml @@ -49,24 +49,24 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: monitor-gating - template: imagestream.yml - objectname: imagestream.yml + object_app: monitor-gating + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: monitor-gating - template: buildconfig.yml - objectname: buildconfig.yml + object_app: monitor-gating + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: monitor-gating - template: secret.yml - objectname: secret.yml + object_app: monitor-gating + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: monitor-gating - template: configmap.yml - objectname: configmap.yml + object_app: monitor-gating + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/secret-file app: monitor-gating @@ -75,9 +75,9 @@ privatefile: "git-ssh/monitor_gating" - role: openshift/object - app: monitor-gating - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: monitor-gating + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/start-build app: monitor-gating @@ -87,31 +87,31 @@ - build - role: openshift/object - app: monitor-gating - template: dashboard_config.yml - objectname: dashboard_config.yml + object_app: monitor-gating + object_template: dashboard_config.yml + object_objectname: dashboard_config.yml - role: openshift/object - app: monitor-gating - template: dashboard_configmap.yml - objectname: dashboard_configmap.yml + object_app: monitor-gating + object_template: dashboard_configmap.yml + object_objectname: dashboard_configmap.yml - role: openshift/object - app: monitor-gating - template: dashboard_configmap.yml - objectname: dashboard_configmap.yml + object_app: monitor-gating + object_template: dashboard_configmap.yml + object_objectname: dashboard_configmap.yml - role: openshift/object - app: monitor-gating - template: dashboard_route.yml - objectname: dashboard_route.yml + object_app: monitor-gating + object_template: dashboard_route.yml + object_objectname: dashboard_route.yml - role: openshift/object - app: monitor-gating - template: dashboard_serviceaccount.yml - objectname: dashboard_serviceaccount.yml + object_app: monitor-gating + object_template: dashboard_serviceaccount.yml + object_objectname: dashboard_serviceaccount.yml - role: openshift/object - app: monitor-gating - template: dashboard_deploymentconfig.yml - objectname: dashboard_deploymentconfig.yml + object_app: monitor-gating + object_template: dashboard_deploymentconfig.yml + object_objectname: dashboard_deploymentconfig.yml diff --git a/playbooks/openshift-apps/mote.yml b/playbooks/openshift-apps/mote.yml index 6aaf87d2f9..29d1ca6792 100644 --- a/playbooks/openshift-apps/mote.yml +++ b/playbooks/openshift-apps/mote.yml @@ -24,52 +24,52 @@ imagename: mote - role: openshift/object - template: buildconfig.yml - objectname: buildconfig.yml + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - template: mote-dc.yml - objectname: mote-dc.yml + object_template: mote-dc.yml + object_objectname: mote-dc.yml - role: openshift/object - template: mote-worker-dc.yml - objectname: mote-worker-dc.yml + object_template: mote-worker-dc.yml + object_objectname: mote-worker-dc.yml - role: openshift/object - template: fedmsg-dc.yml - objectname: fedmsg-dc.yml + object_template: fedmsg-dc.yml + object_objectname: fedmsg-dc.yml - role: openshift/object - template: redis-is.yml - objectname: redis-is.yml + object_template: redis-is.yml + object_objectname: redis-is.yml - role: openshift/object - template: redis-dc.yml - objectname: redis-dc.yml + object_template: redis-dc.yml + object_objectname: redis-dc.yml - role: openshift/object - template: redis-svc.yml - objectname: redis-svc.yml + object_template: redis-svc.yml + object_objectname: redis-svc.yml - role: openshift/object - template: mote-svc.yml - objectname: mote-svc.yml + object_template: mote-svc.yml + object_objectname: mote-svc.yml - role: openshift/object - template: mote-cm.yml - objectname: mote-cm.yml + object_template: mote-cm.yml + object_objectname: mote-cm.yml - role: openshift/object - template: secret.yml - objectname: secret.yml + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - template: fedmsg-cm.yml - objectname: fedmsg-cm.yml + object_template: fedmsg-cm.yml + object_objectname: fedmsg-cm.yml - role: openshift/object - template: pvc.yml - objectname: pvc.yml + object_template: pvc.yml + object_objectname: pvc.yml - role: openshift/route routename: mote diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index e3b1f9db68..323afe3a88 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -58,26 +58,26 @@ imagename: noggin - role: openshift/object - app: noggin - os_app: noggin-centos - template: buildconfig.yml - objectname: buildconfig.yml + object_app: noggin + object_os_app: noggin-centos + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: noggin - os_app: noggin-centos - template: configmap.yml - objectname: configmap.yml + object_app: noggin + object_os_app: noggin-centos + object_template: configmap.yml + object_objectname: configmap.yml noggin_theme: centos - role: openshift/ipa-client app: noggin-centos - role: openshift/object - app: noggin - os_app: noggin-centos - template: service.yml - objectname: service.yml + object_app: noggin + object_os_app: noggin-centos + object_template: service.yml + object_objectname: service.yml - role: openshift/route app: noggin-centos @@ -89,22 +89,22 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: noggin - os_app: noggin-centos - template: secrets.yml - objectname: secrets.yml + object_app: noggin + object_os_app: noggin-centos + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: noggin - os_app: noggin-centos - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: noggin + object_os_app: noggin-centos + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml - role: openshift/object - app: noggin - os_app: noggin-centos - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: noggin + object_os_app: noggin-centos + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/start-build app: noggin-centos diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index afc6ff520e..e7dfda828a 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -58,23 +58,23 @@ imagename: noggin - role: openshift/object - app: noggin - template: buildconfig.yml - objectname: buildconfig.yml + object_app: noggin + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: noggin - template: configmap.yml - objectname: configmap.yml + object_app: noggin + object_template: configmap.yml + object_objectname: configmap.yml noggin_theme: fas - role: openshift/ipa-client app: noggin - role: openshift/object - app: noggin - template: service.yml - objectname: service.yml + object_app: noggin + object_template: service.yml + object_objectname: service.yml - role: openshift/route app: noggin @@ -87,19 +87,19 @@ haproxy.router.openshift.io/set-forwarded-headers: append - role: openshift/object - app: noggin - template: secrets.yml - objectname: secrets.yml + object_app: noggin + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: noggin - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: noggin + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml - role: openshift/object - app: noggin - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: noggin + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/start-build app: noggin diff --git a/playbooks/openshift-apps/openscanhub.yml b/playbooks/openshift-apps/openscanhub.yml index 0df2ca5a6b..e598bc17b2 100644 --- a/playbooks/openshift-apps/openscanhub.yml +++ b/playbooks/openshift-apps/openscanhub.yml @@ -43,17 +43,17 @@ - apply-appowners when: env == "staging" - role: openshift/object - app: openscanhub - template: pvc-var-lib-osh.yml - objectname: pvc-var-lib-osh + object_app: openscanhub + object_template: pvc-var-lib-osh.yml + object_objectname: pvc-var-lib-osh - role: openshift/object - app: openscanhub - template: settings-local-configmap.yml - objectname: settings-local-configmap + object_app: openscanhub + object_template: settings-local-configmap.yml + object_objectname: settings-local-configmap - role: openshift/object - app: openscanhub - template: osh-hub-httpd-configmap.yml - objectname: osh-hub-httpd-configmap + object_app: openscanhub + object_template: osh-hub-httpd-configmap.yml + object_objectname: osh-hub-httpd-configmap - role: openshift/keytab app: openscanhub key: service.keytab @@ -69,69 +69,69 @@ host: "openscanhub.fedoraproject.org" when: env == "production" - role: openshift/object - app: openscanhub - template: deployment-fedora-osh-hub.yml - objectname: deployment-fedora-osh-hub + object_app: openscanhub + object_template: deployment-fedora-osh-hub.yml + object_objectname: deployment-fedora-osh-hub - role: openshift/object - app: openscanhub - template: route-fedora-osh-hub.yml - objectname: route-fedora-osh-hub + object_app: openscanhub + object_template: route-fedora-osh-hub.yml + object_objectname: route-fedora-osh-hub - role: openshift/object - app: openscanhub - file: service-fedora-osh-hub.yml - objectname: service-fedora-osh-hub + object_app: openscanhub + object_file: service-fedora-osh-hub.yml + object_objectname: service-fedora-osh-hub # Configurations for redis. - role: openshift/object - app: openscanhub - template: pvc-var-lib-redis-data.yml - objectname: pvc-var-lib-redis-data + object_app: openscanhub + object_template: pvc-var-lib-redis-data.yml + object_objectname: pvc-var-lib-redis-data - role: openshift/object - app: openscanhub - file: deployment-redis.yml - objectname: deployment-redis + object_app: openscanhub + object_file: deployment-redis.yml + object_objectname: deployment-redis - role: openshift/object - app: openscanhub - file: route-redis.yml - objectname: route-redis + object_app: openscanhub + object_file: route-redis.yml + object_objectname: route-redis - role: openshift/object - app: openscanhub - file: service-redis.yml - objectname: service-redis + object_app: openscanhub + object_file: service-redis.yml + object_objectname: service-redis # Configurations for resalloc-server. - role: openshift/object - app: openscanhub - template: etc-resallocserver-server-configmap.yml - objectname: etc-resallocserver-server-configmap + object_app: openscanhub + object_template: etc-resallocserver-server-configmap.yml + object_objectname: etc-resallocserver-server-configmap - role: openshift/object - app: openscanhub - template: etc-resallocserver-pools-configmap.yml - objectname: etc-resallocserver-pools-configmap + object_app: openscanhub + object_template: etc-resallocserver-pools-configmap.yml + object_objectname: etc-resallocserver-pools-configmap - role: openshift/object - app: openscanhub - template: vm-provisioning-configmap.yml - objectname: vm-provisioning-configmap + object_app: openscanhub + object_template: vm-provisioning-configmap.yml + object_objectname: vm-provisioning-configmap - role: openshift/object - app: openscanhub - template: aws-credentials-configmap.yml - objectname: aws-credentials-configmap + object_app: openscanhub + object_template: aws-credentials-configmap.yml + object_objectname: aws-credentials-configmap - role: openshift/object - app: openscanhub - template: aws-openscanhub-key.yml - objectname: aws-openscanhub-key + object_app: openscanhub + object_template: aws-openscanhub-key.yml + object_objectname: aws-openscanhub-key - role: openshift/object - app: openscanhub - template: deployment-resalloc-server.yml - objectname: deployment-resalloc-server + object_app: openscanhub + object_template: deployment-resalloc-server.yml + object_objectname: deployment-resalloc-server - role: openshift/object - app: openscanhub - template: route-resalloc-server.yml - objectname: route-resalloc-server + object_app: openscanhub + object_template: route-resalloc-server.yml + object_objectname: route-resalloc-server - role: openshift/object - app: openscanhub - template: service-resalloc-server.yml - objectname: service-resalloc-server + object_app: openscanhub + object_template: service-resalloc-server.yml + object_objectname: service-resalloc-server # Configurations for Fedora messaging - role: rabbit/user @@ -163,9 +163,9 @@ key: fedora-messaging-openscanhub.crt privatefile: "rabbitmq/{{env}}/pki/issued/openscanhub{{env_suffix}}.crt" - role: openshift/object - app: openscanhub - template: fedora-messaging-configmap.yml - objectname: fedora-messaging-configmap + object_app: openscanhub + object_template: fedora-messaging-configmap.yml + object_objectname: fedora-messaging-configmap # sudo rbac-playbook -l staging -t delete openshift-apps/openscanhub.yml - role: openshift/object-delete diff --git a/playbooks/openshift-apps/openvpn.yml b/playbooks/openshift-apps/openvpn.yml index 5da5dd1ce0..b4c37714f4 100644 --- a/playbooks/openshift-apps/openvpn.yml +++ b/playbooks/openshift-apps/openvpn.yml @@ -21,42 +21,42 @@ - apply-appowners - role: openshift/object - objectname: imagestream.yml - template: imagestream.yml + object_objectname: imagestream.yml + object_template: imagestream.yml - role: openshift/object - objectname: buildconfig.yml - template: buildconfig.yml + object_objectname: buildconfig.yml + object_template: buildconfig.yml - role: openshift/object - template: serviceaccount.yml - objectname: serviceaccount.yml + object_template: serviceaccount.yml + object_objectname: serviceaccount.yml - role: openshift/object - template: scc.yml - objectname: scc.yml + object_template: scc.yml + object_objectname: scc.yml - role: openshift/object - template: scc_role.yml - objectname: scc_role.yml + object_template: scc_role.yml + object_objectname: scc_role.yml - role: openshift/object - template: scc_rolebinding.yml - objectname: scc_rolebinding.yml + object_template: scc_rolebinding.yml + object_objectname: scc_rolebinding.yml # load openVPN client certs for each node in ocp_nodes into ocp secret # expect certs to be generated in {{private}}/files/vpn/pki/issued/ - role: openshift/object - template: secrets.yml - objectname: secrets.yml + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - template: configmap.yml - objectname: configmap.yml + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - template: deployment.yml - objectname: deployment.yml + object_template: deployment.yml + object_objectname: deployment.yml - role: openshift/start-build buildname: openvpn diff --git a/playbooks/openshift-apps/oraculum.yml b/playbooks/openshift-apps/oraculum.yml index 7124f5800f..dcb72c27dc 100644 --- a/playbooks/openshift-apps/oraculum.yml +++ b/playbooks/openshift-apps/oraculum.yml @@ -59,29 +59,29 @@ - appowners - role: openshift/object - app: oraculum - template: buildconfig.yml - objectname: buildconfig.yml + object_app: oraculum + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: oraculum - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: oraculum + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: oraculum - template: imagestream.yml - objectname: imagestream.yml + object_app: oraculum + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: oraculum - file: service.yml - objectname: service.yml + object_app: oraculum + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: oraculum - template: secret.yml - objectname: secret.yml + object_app: oraculum + object_template: secret.yml + object_objectname: secret.yml - role: openshift/route app: oraculum diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index dc12379f0f..ef8815c438 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/playbooks/openshift-apps/planet.yml @@ -32,27 +32,27 @@ imagename: planet - role: openshift/object - app: planet - template: buildconfig.yml - objectname: buildconfig.yml + object_app: planet + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: planet - template: configmap.yml - objectname: configmap.yml + object_app: planet + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/ipa-client app: planet - role: openshift/object - app: planet - file: service.yml - objectname: service.yml + object_app: planet + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: planet - file: pvc.yml - objectname: pvc.yml + object_app: planet + object_file: pvc.yml + object_objectname: pvc.yml - role: openshift/route app: planet @@ -73,14 +73,14 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: planet - template: deployment.yml - objectname: deployment.yml + object_app: planet + object_template: deployment.yml + object_objectname: deployment.yml - role: openshift/object - app: planet - template: cronjob.yml - objectname: cronjob.yml + object_app: planet + object_template: cronjob.yml + object_objectname: cronjob.yml - role: openshift/secret-file app: planet diff --git a/playbooks/openshift-apps/poddlers.yml b/playbooks/openshift-apps/poddlers.yml index 2763ae45b5..80ba7c3a54 100644 --- a/playbooks/openshift-apps/poddlers.yml +++ b/playbooks/openshift-apps/poddlers.yml @@ -56,9 +56,9 @@ app: poddlers - role: openshift/object - app: poddlers - template: buildconfig.yml - objectname: buildconfig.yml + object_app: poddlers + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/secret-file app: poddlers @@ -79,25 +79,23 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: poddlers - service: poddlers - host: "koji{{env_suffix}}.fedoraproject.org" - template: secrets.yml - objectname: secrets.yml + object_app: poddlers + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: poddlers - template: cron-playtime.yml - objectname: cron-playtime.yml + object_app: poddlers + object_template: cron-playtime.yml + object_objectname: cron-playtime.yml tags: - cron-job - role: openshift/object - app: poddlers - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: poddlers + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: poddlers - file: imagestream.yml - objectname: imagestream.yml + object_app: poddlers + object_file: imagestream.yml + object_objectname: imagestream.yml diff --git a/playbooks/openshift-apps/release-monitoring.yml b/playbooks/openshift-apps/release-monitoring.yml index da19226585..7caadf6314 100644 --- a/playbooks/openshift-apps/release-monitoring.yml +++ b/playbooks/openshift-apps/release-monitoring.yml @@ -35,32 +35,32 @@ key: fedora-messaging-release-monitoring.crt privatefile: "rabbitmq/{{env}}/pki/issued/anitya{{env_suffix}}.crt" - role: openshift/object - app: release-monitoring - file: imagestream.yml - objectname: imagestream.yml + object_app: release-monitoring + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: release-monitoring - template: buildconfig.yml - objectname: buildconfig.yml + object_app: release-monitoring + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: release-monitoring buildname: release-monitoring-web-build - role: openshift/object - app: release-monitoring - template: configmap.yml - objectname: configmap.yml + object_app: release-monitoring + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: release-monitoring - file: service.yml - objectname: service.yml + object_app: release-monitoring + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: release-monitoring - template: route.yml - objectname: route.yml + object_app: release-monitoring + object_template: route.yml + object_objectname: route.yml - role: openshift/object - app: release-monitoring - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: release-monitoring + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: release-monitoring dcname: release-monitoring-web diff --git a/playbooks/openshift-apps/resultsdb-ci-listener.yml b/playbooks/openshift-apps/resultsdb-ci-listener.yml index 4c90be7a21..e484d5853a 100644 --- a/playbooks/openshift-apps/resultsdb-ci-listener.yml +++ b/playbooks/openshift-apps/resultsdb-ci-listener.yml @@ -57,16 +57,16 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: resultsdb-ci-listener - template: secrets.yml - objectname: secrets.yml + object_app: resultsdb-ci-listener + object_template: secrets.yml + object_objectname: secrets.yml - role: openshift/object - app: resultsdb-ci-listener - template: configmaps.yml - objectname: configmaps.yml + object_app: resultsdb-ci-listener + object_template: configmaps.yml + object_objectname: configmaps.yml - role: openshift/object - app: resultsdb-ci-listener - template: deploymentconfigs.yml - objectname: deploymentconfigs.yml + object_app: resultsdb-ci-listener + object_template: deploymentconfigs.yml + object_objectname: deploymentconfigs.yml diff --git a/playbooks/openshift-apps/resultsdb.yml b/playbooks/openshift-apps/resultsdb.yml index 33c0d10014..ad87281236 100644 --- a/playbooks/openshift-apps/resultsdb.yml +++ b/playbooks/openshift-apps/resultsdb.yml @@ -75,29 +75,29 @@ # backend objects - role: openshift/object - app: resultsdb - template: backend/secrets.yml - objectname: backend-secrets.yml + object_app: resultsdb + object_template: backend/secrets.yml + object_objectname: backend-secrets.yml - role: openshift/object - app: resultsdb - template: backend/configmaps.yml - objectname: backend-configmaps.yml + object_app: resultsdb + object_template: backend/configmaps.yml + object_objectname: backend-configmaps.yml - role: openshift/object - app: resultsdb - template: backend/imagestream.yml - objectname: backend-imagestream.yml + object_app: resultsdb + object_template: backend/imagestream.yml + object_objectname: backend-imagestream.yml - role: openshift/object - app: resultsdb - template: backend/deploymentconfigs.yml - objectname: backend-deploymentconfigs.yml + object_app: resultsdb + object_template: backend/deploymentconfigs.yml + object_objectname: backend-deploymentconfigs.yml - role: openshift/object - app: resultsdb - template: backend/services.yml - objectname: backend-services.yml + object_app: resultsdb + object_template: backend/services.yml + object_objectname: backend-services.yml - role: openshift/route app: resultsdb @@ -109,24 +109,24 @@ # frontend objects - role: openshift/object - app: resultsdb - template: frontend/secrets.yml - objectname: frontend-secrets.yml + object_app: resultsdb + object_template: frontend/secrets.yml + object_objectname: frontend-secrets.yml - role: openshift/object - app: resultsdb - template: frontend/configmaps.yml - objectname: frontend-configmaps.yml + object_app: resultsdb + object_template: frontend/configmaps.yml + object_objectname: frontend-configmaps.yml - role: openshift/object - app: resultsdb - template: frontend/deploymentconfigs.yml - objectname: frontend-deploymentconfigs.yml + object_app: resultsdb + object_template: frontend/deploymentconfigs.yml + object_objectname: frontend-deploymentconfigs.yml - role: openshift/object - app: resultsdb - template: frontend/services.yml - objectname: frontend-services.yml + object_app: resultsdb + object_template: frontend/services.yml + object_objectname: frontend-services.yml - role: openshift/route app: resultsdb diff --git a/playbooks/openshift-apps/review-stats.yml b/playbooks/openshift-apps/review-stats.yml index be564b6488..ae7a5f087d 100644 --- a/playbooks/openshift-apps/review-stats.yml +++ b/playbooks/openshift-apps/review-stats.yml @@ -22,23 +22,23 @@ app: review-stats imagename: builder - role: openshift/object - app: review-stats - objectname: buildconfig.yml - template: buildconfig.yml + object_app: review-stats + object_objectname: buildconfig.yml + object_template: buildconfig.yml - role: openshift/object - app: review-stats - template: configmap.yml - objectname: configmap.yml + object_app: review-stats + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: review-stats - template: pvc.yml - objectname: pvc.yml + object_app: review-stats + object_template: pvc.yml + object_objectname: pvc.yml - role: openshift/start-build app: review-stats buildname: builder-build - role: openshift/object - app: review-stats - template: cron.yml - objectname: cron.yml + object_app: review-stats + object_template: cron.yml + object_objectname: cron.yml tags: - deploy-cronjob diff --git a/playbooks/openshift-apps/test-auth.yml b/playbooks/openshift-apps/test-auth.yml index 3f43b552f0..43855c1dcd 100644 --- a/playbooks/openshift-apps/test-auth.yml +++ b/playbooks/openshift-apps/test-auth.yml @@ -25,19 +25,19 @@ imagename: test-auth - role: openshift/object - app: test-auth - template: buildconfig.yml - objectname: buildconfig.yml + object_app: test-auth + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: test-auth - template: configmap.yml - objectname: configmap.yml + object_app: test-auth + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: test-auth - file: service.yml - objectname: service.yml + object_app: test-auth + object_file: service.yml + object_objectname: service.yml # - role: openshift/route # app: test-auth @@ -58,11 +58,11 @@ haproxy.router.openshift.io/timeout: 5m - role: openshift/object - app: test-auth - template: secret-webhook.yml - objectname: secret-webhook.yml + object_app: test-auth + object_template: secret-webhook.yml + object_objectname: secret-webhook.yml - role: openshift/object - app: test-auth - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: test-auth + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml diff --git a/playbooks/openshift-apps/testdays.yml b/playbooks/openshift-apps/testdays.yml index 71940ae222..6fc8847823 100644 --- a/playbooks/openshift-apps/testdays.yml +++ b/playbooks/openshift-apps/testdays.yml @@ -73,24 +73,24 @@ - appowners - role: openshift/object - app: testdays - template: buildconfig.yml - objectname: buildconfig.yml + object_app: testdays + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: testdays - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: testdays + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: testdays - template: imagestream.yml - objectname: imagestream.yml + object_app: testdays + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: testdays - file: service.yml - objectname: service.yml + object_app: testdays + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: testdays diff --git a/playbooks/openshift-apps/the-new-hotness.yml b/playbooks/openshift-apps/the-new-hotness.yml index 85b9596763..d9739cc1aa 100644 --- a/playbooks/openshift-apps/the-new-hotness.yml +++ b/playbooks/openshift-apps/the-new-hotness.yml @@ -64,24 +64,24 @@ privatefile: "rabbitmq/{{env}}/pki/issued/the-new-hotness{{env_suffix}}.crt" - role: openshift/object - app: the-new-hotness - file: imagestream.yml - objectname: imagestream.yml + object_app: the-new-hotness + object_file: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: the-new-hotness - file: service.yml - objectname: service.yml + object_app: the-new-hotness + object_file: service.yml + object_objectname: service.yml - role: openshift/object - app: the-new-hotness - template: buildconfig.yml - objectname: buildconfig.yml + object_app: the-new-hotness + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: the-new-hotness - template: configmap.yml - objectname: configmap.yml + object_app: the-new-hotness + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/start-build app: the-new-hotness @@ -89,9 +89,9 @@ objectname: the-new-hotness-build - role: openshift/object - app: the-new-hotness - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: the-new-hotness + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: the-new-hotness diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index 5125fb5e0e..8b5a3c6d6b 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/playbooks/openshift-apps/toddlers.yml @@ -70,9 +70,9 @@ app: toddlers - role: openshift/object - app: toddlers - template: buildconfig.yml - objectname: buildconfig.yml + object_app: toddlers + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/secret-file app: toddlers @@ -93,28 +93,26 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: toddlers - template: cron_playtime.yml - objectname: cron_playtime.yml + object_app: toddlers + object_template: cron_playtime.yml + object_objectname: cron_playtime.yml tags: - cron-job - role: openshift/object - app: toddlers - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: toddlers + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/object - app: toddlers - service: toddlers - host: "koji{{env_suffix}}.fedoraproject.org" - template: secret.yml - objectname: secret.yml + object_app: toddlers + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: toddlers - template: imagestream.yml - objectname: imagestream.yml + object_app: toddlers + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/start-build app: toddlers diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index c0a201059e..75c5d6ba56 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -16,23 +16,23 @@ project_appowners: - suanand - role: openshift/object - app: transtats - objectname: secret.yml - template: secret.yml + object_app: transtats + object_objectname: secret.yml + object_template: secret.yml - role: openshift/imagestream app: transtats imagename: transtats - role: openshift/object - app: transtats - template: buildconfig.yml - objectname: buildconfig.yml + object_app: transtats + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: transtats buildname: transtats-build - role: openshift/object - app: transtats - file: service.yml - objectname: service.yml + object_app: transtats + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: transtats routename: transtats-web @@ -43,9 +43,9 @@ annotations: haproxy.router.openshift.io/timeout: 8m - role: openshift/object - app: transtats - file: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: transtats + object_file: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: transtats dcname: transtats-web diff --git a/playbooks/openshift-apps/waiverdb.yml b/playbooks/openshift-apps/waiverdb.yml index f3551df1ac..84cf23b1a5 100644 --- a/playbooks/openshift-apps/waiverdb.yml +++ b/playbooks/openshift-apps/waiverdb.yml @@ -58,9 +58,9 @@ - apply-appowners - role: openshift/object - app: waiverdb - template: secret.yml - objectname: secret.yml + object_app: waiverdb + object_template: secret.yml + object_objectname: secret.yml - role: openshift/secret-file app: waiverdb @@ -81,24 +81,24 @@ privatefile: "rabbitmq/{{env}}/pki/ca.crt" - role: openshift/object - app: waiverdb - template: imagestream.yml - objectname: imagestream.yml + object_app: waiverdb + object_template: imagestream.yml + object_objectname: imagestream.yml - role: openshift/object - app: waiverdb - template: buildconfig.yml - objectname: buildconfig.yml + object_app: waiverdb + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: waiverdb - template: configmap.yml - objectname: configmap.yml + object_app: waiverdb + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: waiverdb - file: service.yml - objectname: service.yml + object_app: waiverdb + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: waiverdb @@ -109,14 +109,14 @@ # TODO -- someday retire this old route in favor of the pretty one above. - role: openshift/object - app: waiverdb - file: route.yml - objectname: route.yml + object_app: waiverdb + object_file: route.yml + object_objectname: route.yml - role: openshift/object - app: waiverdb - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: waiverdb + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: waiverdb diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index d6f78e6d81..6785ea23f6 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -70,19 +70,19 @@ imagename: webhook2fedmsg - role: openshift/object - app: webhook2fedmsg - template: buildconfig.yml - objectname: buildconfig.yml + object_app: webhook2fedmsg + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/object - app: webhook2fedmsg - template: configmap.yml - objectname: configmap.yml + object_app: webhook2fedmsg + object_template: configmap.yml + object_objectname: configmap.yml - role: openshift/object - app: webhook2fedmsg - file: service.yml - objectname: service.yml + object_app: webhook2fedmsg + object_file: service.yml + object_objectname: service.yml # Routes - role: openshift/route @@ -109,9 +109,9 @@ # Deployment config - role: openshift/object - app: webhook2fedmsg - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: webhook2fedmsg + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml # - role: openshift/start-build # app: webhook2fedmsg diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml index 2d2e3177f0..9cb781a376 100644 --- a/playbooks/openshift-apps/websites.yml +++ b/playbooks/openshift-apps/websites.yml @@ -22,18 +22,18 @@ # legacy websites - role: openshift/object - app: websites - file: pvc.yml - objectname: pvc.yml + object_app: websites + object_file: pvc.yml + object_objectname: pvc.yml - role: openshift/imagestream app: websites imagename: fedora-websites - role: openshift/object - app: websites - template: fedora-websites-bc.yml - objectname: fedora-websites-bc.yml + object_app: websites + object_template: fedora-websites-bc.yml + object_objectname: fedora-websites-bc.yml - role: openshift/start-build app: websites @@ -41,9 +41,9 @@ objectname: fedora-websites - role: openshift/object - app: websites - template: fedora-websites-cron.yml - objectname: fedora-websites-cron.yml + object_app: websites + object_template: fedora-websites-cron.yml + object_objectname: fedora-websites-cron.yml # New websites 3.0 - role: openshift/imagestream @@ -51,9 +51,9 @@ imagename: builder - role: openshift/object - app: websites - template: buildconfig.yml - objectname: buildconfig.yml + object_app: websites + object_template: buildconfig.yml + object_objectname: buildconfig.yml - role: openshift/start-build app: websites @@ -61,11 +61,11 @@ objectname: websites-build - role: openshift/object - app: websites - file: obc.yml - objectname: obc.yml + object_app: websites + object_file: obc.yml + object_objectname: obc.yml - role: openshift/object - app: websites - template: deployment.yml - objectname: deployment.yml + object_app: websites + object_template: deployment.yml + object_objectname: deployment.yml diff --git a/playbooks/openshift-apps/zezere.yml b/playbooks/openshift-apps/zezere.yml index a8a5219d31..11d26fcbe9 100644 --- a/playbooks/openshift-apps/zezere.yml +++ b/playbooks/openshift-apps/zezere.yml @@ -19,16 +19,16 @@ app: zezere imagename: zezere - role: openshift/object - app: zezere - objectname: buildconfig.yml - file: buildconfig.yml + object_app: zezere + object_objectname: buildconfig.yml + object_file: buildconfig.yml - role: openshift/start-build app: zezere buildname: zezere-build - role: openshift/object - app: zezere - file: service.yml - objectname: service.yml + object_app: zezere + object_file: service.yml + object_objectname: service.yml - role: openshift/route app: zezere routename: zezere @@ -38,13 +38,13 @@ annotations: haproxy.router.openshift.io/set-forwarded-headers: append - role: openshift/object - app: zezere - template: secret.yml - objectname: secret.yml + object_app: zezere + object_template: secret.yml + object_objectname: secret.yml - role: openshift/object - app: zezere - template: deploymentconfig.yml - objectname: deploymentconfig.yml + object_app: zezere + object_template: deploymentconfig.yml + object_objectname: deploymentconfig.yml - role: openshift/rollout app: zezere dcname: zezere diff --git a/roles/openshift-apps/koschei/templates/backend-deployment.yml b/roles/openshift-apps/koschei/templates/backend-deployment.yml index 8eaa2e94cb..ea64cadc7c 100644 --- a/roles/openshift-apps/koschei/templates/backend-deployment.yml +++ b/roles/openshift-apps/koschei/templates/backend-deployment.yml @@ -3,25 +3,25 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{service}} + name: {{object_service}} labels: - service: {{service}} + service: {{object_service}} spec: replicas: 1 selector: matchLabels: - service: {{service}} + service: {{object_service}} strategy: type: Recreate template: metadata: labels: - service: {{service}} + service: {{object_service}} spec: containers: - - name: {{service}} + - name: {{object_service}} image: image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest - command: ["/usr/bin/koschei-{{service}}"] + command: ["/usr/bin/koschei-{{object_service}}"] env: - name: SUDO_USER value: admin @@ -43,11 +43,11 @@ spec: readOnly: true resources: requests: - cpu: "{{ min_cpu }}m" - memory: "{{ min_mem }}Mi" + cpu: "{{ object_min_cpu }}m" + memory: "{{ object_min_mem }}Mi" limits: - cpu: "{{ max_cpu }}m" - memory: "{{ max_mem }}Mi" + cpu: "{{ object_max_cpu }}m" + memory: "{{ object_max_mem }}Mi" readinessProbe: initialDelaySeconds: 5 exec: diff --git a/roles/openshift-apps/koschei/templates/cronjob.yml b/roles/openshift-apps/koschei/templates/cronjob.yml index 43c592e382..6f8c6c8448 100644 --- a/roles/openshift-apps/koschei/templates/cronjob.yml +++ b/roles/openshift-apps/koschei/templates/cronjob.yml @@ -2,21 +2,21 @@ apiVersion: batch/v1 kind: CronJob metadata: - name: "cron-{{name}}" + name: "cron-{{object_name}}" spec: concurrencyPolicy: Forbid - schedule: "{{schedule}}" + schedule: "{{object_schedule}}" jobTemplate: spec: template: spec: containers: - - name: "cron-{{name}}" + - name: "cron-{{object_name}}" image: "image-registry.openshift-image-registry.svc:5000/koschei/koschei:latest" - command: ["/bin/bash", "-euxc", "{{command}}"] + command: ["/bin/bash", "-euxc", "{{object_command}}"] env: - name: SUDO_USER - value: "cron-{{name}}" + value: "cron-{{object_name}}" volumeMounts: - name: config mountPath: /etc/koschei diff --git a/roles/openshift/imagestream/tasks/main.yml b/roles/openshift/imagestream/tasks/main.yml index dbec0049c7..5c7233a98e 100644 --- a/roles/openshift/imagestream/tasks/main.yml +++ b/roles/openshift/imagestream/tasks/main.yml @@ -3,5 +3,5 @@ include_role: name: openshift/object vars: - objectname: imagestream-{{imagename}}.yml + object_objectname: imagestream-{{imagename}}.yml template_fullpath: "{{roles_path}}/openshift/imagestream/templates/imagestream.yml" diff --git a/roles/openshift/object/defaults/main.yml b/roles/openshift/object/defaults/main.yml index b6cd869d8f..fbb829b886 100644 --- a/roles/openshift/object/defaults/main.yml +++ b/roles/openshift/object/defaults/main.yml @@ -1,3 +1,3 @@ --- -os_app: "{{app}}" -always_apply: false +object_os_app: "{{app}}" +object_always_apply: false diff --git a/roles/openshift/object/tasks/main.yml b/roles/openshift/object/tasks/main.yml index 2025304565..a0647d8409 100644 --- a/roles/openshift/object/tasks/main.yml +++ b/roles/openshift/object/tasks/main.yml @@ -1,19 +1,19 @@ --- -- name: Copy template {{template}} to temporary file ({{tmpfile.path}}) - template: src={{roles_path}}/openshift-apps/{{app}}/templates/{{template}} dest=/etc/openshift_apps/{{os_app}}/{{objectname}} - when: template is defined - register: object_template +- name: Copy template {{object_template}} to temporary file ({{tmpfile.path}}) + template: src={{roles_path}}/openshift-apps/{{object_app}}/templates/{{object_template}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}} + when: object_template is defined + register: object_template_result -- name: Copy template {{template_fullpath}} to temporary file ({{tmpfile.path}}) - template: src={{template_fullpath}} dest=/etc/openshift_apps/{{os_app}}/{{objectname}} - when: template_fullpath is defined and template is not defined - register: object_template_fullpath +- name: Copy template {{object_template_fullpath}} to temporary file ({{tmpfile.path}}) + template: src={{object_template_fullpath}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}} + when: object_template_fullpath is defined and object_template is not defined + register: object_template_fullpath_result -- name: Copy file {{file}} to temporary file ({{tmpfile.path}}) - copy: src={{roles_path}}/openshift-apps/{{app}}/files/{{file}} dest=/etc/openshift_apps/{{os_app}}/{{objectname}} - when: file is defined and template is not defined and template_fullpath is not defined - register: object_file +- name: Copy file {{object_file}} to temporary file ({{tmpfile.path}}) + copy: src={{roles_path}}/openshift-apps/{{object_app}}/files/{{object_file}} dest=/etc/openshift_apps/{{object_os_app}}/{{object_objectname}} + when: object_file is defined and object_template is not defined and object_template_fullpath is not defined + register: object_file_result - name: Call `oc apply` on the copied file - shell: oc -n {{os_app}} apply --validate=strict -f /etc/openshift_apps/{{os_app}}/{{objectname}} - when: object_template.changed or object_template_fullpath.changed or object_file.changed or always_apply + shell: oc -n {{object_os_app}} apply --validate=strict -f /etc/openshift_apps/{{object_os_app}}/{{object_objectname}} + when: object_template_result.changed or object_template_fullpath_result.changed or object_file_result.changed or object_always_apply diff --git a/roles/openshift/project/tasks/main.yml b/roles/openshift/project/tasks/main.yml index 7eba090667..a318b7fe51 100644 --- a/roles/openshift/project/tasks/main.yml +++ b/roles/openshift/project/tasks/main.yml @@ -26,48 +26,48 @@ include_role: name: openshift/object vars: - objectname: deployer.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/deployer.yml" + object_objectname: deployer.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/deployer.yml" - name: imagebuilder.yml include_role: name: openshift/object vars: - objectname: imagebuilder.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/imagebuilder.yml" + object_objectname: imagebuilder.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagebuilder.yml" - name: imagepuller.yml include_role: name: openshift/object vars: - objectname: imagepuller.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/imagepuller.yml" + object_objectname: imagepuller.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/imagepuller.yml" - name: role-appowners.yml include_role: name: openshift/object vars: - objectname: role-appowners.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml" + object_objectname: role-appowners.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/role-appowners.yml" - name: appowners.yml include_role: name: openshift/object vars: - objectname: appowners.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/appowners.yml" + object_objectname: appowners.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/appowners.yml" - name: alertmanager.yml include_role: name: openshift/object vars: - objectname: alertmanager.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/alertmanager.yml" + object_objectname: alertmanager.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/alertmanager.yml" - name: prometheusRules.yml include_role: name: openshift/object vars: - objectname: prometheusRules.yml - template_fullpath: "{{roles_path}}/openshift/project/templates/prometheusRules.yml" + object_objectname: prometheusRules.yml + object_template_fullpath: "{{roles_path}}/openshift/project/templates/prometheusRules.yml" when: project_alerting diff --git a/roles/openshift/route/tasks/main.yml b/roles/openshift/route/tasks/main.yml index 7e5821cbf3..bc08913261 100644 --- a/roles/openshift/route/tasks/main.yml +++ b/roles/openshift/route/tasks/main.yml @@ -3,5 +3,5 @@ include_role: name: openshift/object vars: - objectname: route-{{routename}}.yml - template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml" + object_objectname: route-{{routename}}.yml + object_template_fullpath: "{{roles_path}}/openshift/route/templates/route.yml"