diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml index 74692a12c4..d0393d1ce5 100644 --- a/playbooks/openshift-apps/bodhi.yml +++ b/playbooks/openshift-apps/bodhi.yml @@ -99,8 +99,8 @@ object_template: imagestreams-tagged.yml object_objectname: imagestreams.yml - role: openshift/imagestream - app: bodhi - imagename: bodhi-base + imagestream_app: bodhi + imagestream_imagename: bodhi-base - role: openshift/object object_app: bodhi object_template: buildconfig.yml @@ -143,8 +143,8 @@ object_template: critpathcron.yml object_objectname: critpathcron.yml - role: openshift/imagestream - app: bodhi - imagename: bodhi-critpathcron + imagestream_app: bodhi + imagestream_imagename: bodhi-critpathcron - role: openshift/rollout rollout_app: bodhi rollout_dcname: bodhi-web diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index c5b25d142d..0e40606d15 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/playbooks/openshift-apps/bugzilla2fedmsg.yml @@ -66,8 +66,8 @@ keytab_service: bugzilla2fedmsg - role: openshift/imagestream - app: bugzilla2fedmsg - imagename: bugzilla2fedmsg + imagestream_app: bugzilla2fedmsg + imagestream_imagename: bugzilla2fedmsg - role: openshift/object object_app: bugzilla2fedmsg diff --git a/playbooks/openshift-apps/discourse2fedmsg.yml b/playbooks/openshift-apps/discourse2fedmsg.yml index 1968afddeb..589da071bb 100644 --- a/playbooks/openshift-apps/discourse2fedmsg.yml +++ b/playbooks/openshift-apps/discourse2fedmsg.yml @@ -41,8 +41,8 @@ privatefile: "rabbitmq/{{env}}/pki/private/discourse2fedmsg{{env_suffix}}.key" - role: openshift/imagestream - app: discourse2fedmsg - imagename: discourse2fedmsg + imagestream_app: discourse2fedmsg + imagestream_imagename: discourse2fedmsg - role: openshift/object object_app: discourse2fedmsg diff --git a/playbooks/openshift-apps/docsbuilding.yml b/playbooks/openshift-apps/docsbuilding.yml index 56fecd36ec..b09b62eead 100644 --- a/playbooks/openshift-apps/docsbuilding.yml +++ b/playbooks/openshift-apps/docsbuilding.yml @@ -29,8 +29,8 @@ - appowners - role: openshift/imagestream - app: docsbuilding - imagename: builder + imagestream_app: docsbuilding + imagestream_imagename: builder - role: openshift/object object_app: docsbuilding diff --git a/playbooks/openshift-apps/docstranslation.yml b/playbooks/openshift-apps/docstranslation.yml index a267fbb3d2..58fdd8c44a 100644 --- a/playbooks/openshift-apps/docstranslation.yml +++ b/playbooks/openshift-apps/docstranslation.yml @@ -29,7 +29,8 @@ ansible.builtin.include_role: name: openshift/imagestream vars: - imagename: builder + imagestream_app: docstranslation + imagestream_imagename: builder - name: Define buildconfig ansible.builtin.include_role: diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index 9b5ae1f3a1..6a0915343e 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/playbooks/openshift-apps/fasjson.yml @@ -70,8 +70,8 @@ privatefile: "fasjson/session.{{env}}.key" - role: openshift/imagestream - app: fasjson - imagename: fasjson + imagestream_app: fasjson + imagestream_imagename: fasjson - role: openshift/object object_app: fasjson diff --git a/playbooks/openshift-apps/flask-oidc-dev.yml b/playbooks/openshift-apps/flask-oidc-dev.yml index 77d1f86c18..3fd6f6899f 100644 --- a/playbooks/openshift-apps/flask-oidc-dev.yml +++ b/playbooks/openshift-apps/flask-oidc-dev.yml @@ -24,8 +24,8 @@ - apply-appowners - role: openshift/imagestream - app: flask-oidc-dev - imagename: flask-oidc-dev + imagestream_app: flask-oidc-dev + imagestream_imagename: flask-oidc-dev - role: openshift/object object_app: flask-oidc-dev diff --git a/playbooks/openshift-apps/ipsilon-website.yml b/playbooks/openshift-apps/ipsilon-website.yml index 24cc1d4963..8157c7611e 100644 --- a/playbooks/openshift-apps/ipsilon-website.yml +++ b/playbooks/openshift-apps/ipsilon-website.yml @@ -21,8 +21,8 @@ - apply-appowners - role: openshift/imagestream - app: ipsilon-website - imagename: ipsilon-website + imagestream_app: ipsilon-website + imagestream_imagename: ipsilon-website - role: openshift/object object_app: ipsilon-website diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index 1d663dfac0..1685d20fe1 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/playbooks/openshift-apps/noggin-centos.yml @@ -54,8 +54,8 @@ privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key" - role: openshift/imagestream - app: noggin-centos - imagename: noggin + imagestream_app: noggin-centos + imagestream_imagename: noggin - role: openshift/object object_app: noggin diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index f61aa251ae..e3964eb7e6 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/playbooks/openshift-apps/noggin.yml @@ -54,8 +54,8 @@ privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key" - role: openshift/imagestream - app: noggin - imagename: noggin + imagestream_app: noggin + imagestream_imagename: noggin - role: openshift/object object_app: noggin diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index 857c00474e..91a23eaf46 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/playbooks/openshift-apps/planet.yml @@ -28,8 +28,8 @@ keytab_host: "planet.apps.ocp{{env_suffix}}.fedoraproject.org" - role: openshift/imagestream - app: planet - imagename: planet + imagestream_app: planet + imagestream_imagename: planet - role: openshift/object object_app: planet diff --git a/playbooks/openshift-apps/review-stats.yml b/playbooks/openshift-apps/review-stats.yml index ae7a5f087d..84082bd70f 100644 --- a/playbooks/openshift-apps/review-stats.yml +++ b/playbooks/openshift-apps/review-stats.yml @@ -19,8 +19,8 @@ tags: - apply-appowners - role: openshift/imagestream - app: review-stats - imagename: builder + imagestream_app: review-stats + imagestream_imagename: builder - role: openshift/object object_app: review-stats object_objectname: buildconfig.yml diff --git a/playbooks/openshift-apps/test-auth.yml b/playbooks/openshift-apps/test-auth.yml index 881ae388ae..c3bf14c236 100644 --- a/playbooks/openshift-apps/test-auth.yml +++ b/playbooks/openshift-apps/test-auth.yml @@ -21,8 +21,8 @@ - apply-appowners - role: openshift/imagestream - app: test-auth - imagename: test-auth + imagestream_app: test-auth + imagestream_imagename: test-auth - role: openshift/object object_app: test-auth diff --git a/playbooks/openshift-apps/transtats.yml b/playbooks/openshift-apps/transtats.yml index 340dbe1a1b..d379a870c5 100644 --- a/playbooks/openshift-apps/transtats.yml +++ b/playbooks/openshift-apps/transtats.yml @@ -20,8 +20,8 @@ object_objectname: secret.yml object_template: secret.yml - role: openshift/imagestream - app: transtats - imagename: transtats + imagestream_app: transtats + imagestream_imagename: transtats - role: openshift/object object_app: transtats object_template: buildconfig.yml diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index 86861250c1..333d690cff 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/playbooks/openshift-apps/webhook2fedmsg.yml @@ -66,8 +66,8 @@ privatefile: "rabbitmq/{{env}}/pki/private/webhook2fedmsg{{env_suffix}}.key" - role: openshift/imagestream - app: webhook2fedmsg - imagename: webhook2fedmsg + imagestream_app: webhook2fedmsg + imagestream_imagename: webhook2fedmsg - role: openshift/object object_app: webhook2fedmsg diff --git a/playbooks/openshift-apps/websites.yml b/playbooks/openshift-apps/websites.yml index 9cb781a376..fcd82bf98e 100644 --- a/playbooks/openshift-apps/websites.yml +++ b/playbooks/openshift-apps/websites.yml @@ -27,8 +27,8 @@ object_objectname: pvc.yml - role: openshift/imagestream - app: websites - imagename: fedora-websites + imagestream_app: websites + imagestream_imagename: fedora-websites - role: openshift/object object_app: websites @@ -47,8 +47,8 @@ # New websites 3.0 - role: openshift/imagestream - app: websites - imagename: builder + imagestream_app: websites + imagestream_imagename: builder - role: openshift/object object_app: websites diff --git a/playbooks/openshift-apps/zezere.yml b/playbooks/openshift-apps/zezere.yml index f7155354e3..63aabeb505 100644 --- a/playbooks/openshift-apps/zezere.yml +++ b/playbooks/openshift-apps/zezere.yml @@ -16,8 +16,8 @@ project_appowners: - pbrobinson - role: openshift/imagestream - app: zezere - imagename: zezere + imagestream_app: zezere + imagestream_imagename: zezere - role: openshift/object object_app: zezere object_objectname: buildconfig.yml diff --git a/roles/openshift/imagestream/tasks/main.yml b/roles/openshift/imagestream/tasks/main.yml index 5c7233a98e..de82ba05ed 100644 --- a/roles/openshift/imagestream/tasks/main.yml +++ b/roles/openshift/imagestream/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: imagestream-{{imagename}}.yml +- name: imagestream-{{imagestream_imagename}}.yml include_role: name: openshift/object vars: - object_objectname: imagestream-{{imagename}}.yml + object_objectname: imagestream-{{imagestream_imagename}}.yml template_fullpath: "{{roles_path}}/openshift/imagestream/templates/imagestream.yml" diff --git a/roles/openshift/imagestream/templates/imagestream.yml b/roles/openshift/imagestream/templates/imagestream.yml index 4e1af50e2a..cd5e1632db 100644 --- a/roles/openshift/imagestream/templates/imagestream.yml +++ b/roles/openshift/imagestream/templates/imagestream.yml @@ -2,4 +2,4 @@ apiVersion: image.openshift.io/v1 kind: ImageStream metadata: - name: {{ imagename }} + name: {{ imagestream_imagename }}