Prefix openshift/imagestream

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

playbooks/openshift-apps/bodhi.yml

@@ -99,8 +99,8 @@
     object_template: imagestreams-tagged.yml
     object_objectname: imagestreams.yml
   - role: openshift/imagestream
-    app: bodhi
+    imagestream_app: bodhi
-    imagename: bodhi-base
+    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
+    imagestream_app: bodhi
-    imagename: bodhi-critpathcron
+    imagestream_imagename: bodhi-critpathcron
   - role: openshift/rollout
     rollout_app: bodhi
     rollout_dcname: bodhi-web

playbooks/openshift-apps/bugzilla2fedmsg.yml

@@ -66,8 +66,8 @@
     keytab_service: bugzilla2fedmsg
 
   - role: openshift/imagestream
-    app: bugzilla2fedmsg
+    imagestream_app: bugzilla2fedmsg
-    imagename: bugzilla2fedmsg
+    imagestream_imagename: bugzilla2fedmsg
 
   - role: openshift/object
     object_app: bugzilla2fedmsg

playbooks/openshift-apps/discourse2fedmsg.yml

@@ -41,8 +41,8 @@
     privatefile: "rabbitmq/{{env}}/pki/private/discourse2fedmsg{{env_suffix}}.key"
 
   - role: openshift/imagestream
-    app: discourse2fedmsg
+    imagestream_app: discourse2fedmsg
-    imagename: discourse2fedmsg
+    imagestream_imagename: discourse2fedmsg
 
   - role: openshift/object
     object_app: discourse2fedmsg

playbooks/openshift-apps/docsbuilding.yml

@@ -29,8 +29,8 @@
       - appowners
 
   - role: openshift/imagestream
-    app: docsbuilding
+    imagestream_app: docsbuilding
-    imagename: builder
+    imagestream_imagename: builder
 
   - role: openshift/object
     object_app: docsbuilding

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:

playbooks/openshift-apps/fasjson.yml

@@ -70,8 +70,8 @@
     privatefile: "fasjson/session.{{env}}.key"
 
   - role: openshift/imagestream
-    app: fasjson
+    imagestream_app: fasjson
-    imagename: fasjson
+    imagestream_imagename: fasjson
 
   - role: openshift/object
     object_app: fasjson

playbooks/openshift-apps/flask-oidc-dev.yml

@@ -24,8 +24,8 @@
         - apply-appowners
 
     - role: openshift/imagestream
-      app: flask-oidc-dev
+      imagestream_app: flask-oidc-dev
-      imagename: flask-oidc-dev
+      imagestream_imagename: flask-oidc-dev
 
     - role: openshift/object
       object_app: flask-oidc-dev

playbooks/openshift-apps/ipsilon-website.yml

@@ -21,8 +21,8 @@
         - apply-appowners
 
     - role: openshift/imagestream
-      app: ipsilon-website
+      imagestream_app: ipsilon-website
-      imagename: ipsilon-website
+      imagestream_imagename: ipsilon-website
 
     - role: openshift/object
       object_app: ipsilon-website

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
+    imagestream_app: noggin-centos
-    imagename: noggin
+    imagestream_imagename: noggin
 
   - role: openshift/object
     object_app: noggin

playbooks/openshift-apps/noggin.yml

@@ -54,8 +54,8 @@
     privatefile: "rabbitmq/{{env}}/pki/private/noggin{{env_suffix}}.key"
 
   - role: openshift/imagestream
-    app: noggin
+    imagestream_app: noggin
-    imagename: noggin
+    imagestream_imagename: noggin
 
   - role: openshift/object
     object_app: noggin

playbooks/openshift-apps/planet.yml

@@ -28,8 +28,8 @@
     keytab_host: "planet.apps.ocp{{env_suffix}}.fedoraproject.org"
 
   - role: openshift/imagestream
-    app: planet
+    imagestream_app: planet
-    imagename: planet
+    imagestream_imagename: planet
 
   - role: openshift/object
     object_app: planet

playbooks/openshift-apps/review-stats.yml

@@ -19,8 +19,8 @@
     tags:
       - apply-appowners
   - role: openshift/imagestream
-    app: review-stats
+    imagestream_app: review-stats
-    imagename: builder
+    imagestream_imagename: builder
   - role: openshift/object
     object_app: review-stats
     object_objectname: buildconfig.yml

playbooks/openshift-apps/test-auth.yml

@@ -21,8 +21,8 @@
         - apply-appowners
 
     - role: openshift/imagestream
-      app: test-auth
+      imagestream_app: test-auth
-      imagename: test-auth
+      imagestream_imagename: test-auth
 
     - role: openshift/object
       object_app: test-auth

playbooks/openshift-apps/transtats.yml

@@ -20,8 +20,8 @@
     object_objectname: secret.yml
     object_template: secret.yml
   - role: openshift/imagestream
-    app: transtats
+    imagestream_app: transtats
-    imagename: transtats
+    imagestream_imagename: transtats
   - role: openshift/object
     object_app: transtats
     object_template: buildconfig.yml

playbooks/openshift-apps/webhook2fedmsg.yml

@@ -66,8 +66,8 @@
       privatefile: "rabbitmq/{{env}}/pki/private/webhook2fedmsg{{env_suffix}}.key"
 
     - role: openshift/imagestream
-      app: webhook2fedmsg
+      imagestream_app: webhook2fedmsg
-      imagename: webhook2fedmsg
+      imagestream_imagename: webhook2fedmsg
 
     - role: openshift/object
       object_app: webhook2fedmsg

playbooks/openshift-apps/websites.yml

@@ -27,8 +27,8 @@
     object_objectname: pvc.yml
 
   - role: openshift/imagestream
-    app: websites
+    imagestream_app: websites
-    imagename: fedora-websites
+    imagestream_imagename: fedora-websites
 
   - role: openshift/object
     object_app: websites
@@ -47,8 +47,8 @@
 
   # New websites 3.0
   - role: openshift/imagestream
-    app: websites
+    imagestream_app: websites
-    imagename: builder
+    imagestream_imagename: builder
 
   - role: openshift/object
     object_app: websites

playbooks/openshift-apps/zezere.yml

@@ -16,8 +16,8 @@
     project_appowners:
     - pbrobinson
   - role: openshift/imagestream
-    app: zezere
+    imagestream_app: zezere
-    imagename: zezere
+    imagestream_imagename: zezere
   - role: openshift/object
     object_app: zezere
     object_objectname: buildconfig.yml

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"

roles/openshift/imagestream/templates/imagestream.yml

@@ -2,4 +2,4 @@
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
-  name: {{ imagename }}
+  name: {{ imagestream_imagename }}