Prefix openshift/ipa-client

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

playbooks/openshift-apps/badges.yml

@@ -171,7 +171,7 @@
 
     # FASJSON access
     - role: openshift/ipa-client
-      app: badges
+      ipa_client_app: badges
     - role: openshift/keytab
       keytab_app: badges
       keytab_key: fedbadges.keytab

playbooks/openshift-apps/bugzilla2fedmsg.yml

@@ -58,7 +58,7 @@
 
     # FASJSON access
   - role: openshift/ipa-client
-    app: bugzilla2fedmsg
+    ipa_client_app: bugzilla2fedmsg
   - role: openshift/keytab
     keytab_app: bugzilla2fedmsg
     keytab_key: service.keytab

playbooks/openshift-apps/elections.yml

@@ -52,7 +52,7 @@
     keytab_host: "elections{{ env_suffix }}.fedoraproject.org"
 
   - role: openshift/ipa-client
-    app: elections
+    ipa_client_app: elections
 
   - role: openshift/object
     object_app: elections

playbooks/openshift-apps/fasjson.yml

@@ -84,7 +84,7 @@
     object_objectname: configmap.yml
 
   - role: openshift/ipa-client
-    app: fasjson
+    ipa_client_app: fasjson
 
   - role: openshift/object
     object_app: fasjson

playbooks/openshift-apps/fmn.yml

@@ -207,7 +207,7 @@
 
     # FASJSON access
     - role: openshift/ipa-client
-      app: fmn
+      ipa_client_app: fmn
     - role: openshift/keytab
       keytab_app: fmn
       keytab_key: service.keytab

playbooks/openshift-apps/kerneltest.yml

@@ -94,7 +94,7 @@
     object_objectname: configmap.yml
 
   - role: openshift/ipa-client
-    app: kerneltest
+    ipa_client_app: kerneltest
 
   - role: openshift/route
     route_app: kerneltest

playbooks/openshift-apps/maubot.yml

@@ -50,7 +50,7 @@
     keytab_host: "maubot.apps.ocp{{env_suffix}}.fedoraproject.org"
 
   - role: openshift/ipa-client
-    app: maubot
+    ipa_client_app: maubot
 
   - role: openshift/object
     object_app: maubot

playbooks/openshift-apps/noggin-centos.yml

@@ -71,7 +71,7 @@
     noggin_theme: centos
 
   - role: openshift/ipa-client
-    app: noggin-centos
+    ipa_client_app: noggin-centos
 
   - role: openshift/object
     object_app: noggin

playbooks/openshift-apps/noggin.yml

@@ -69,7 +69,7 @@
     noggin_theme: fas
 
   - role: openshift/ipa-client
-    app: noggin
+    ipa_client_app: noggin
 
   - role: openshift/object
     object_app: noggin

playbooks/openshift-apps/planet.yml

@@ -42,7 +42,7 @@
     object_objectname: configmap.yml
 
   - role: openshift/ipa-client
-    app: planet
+    ipa_client_app: planet
 
   - role: openshift/object
     object_app: planet

playbooks/openshift-apps/poddlers.yml

@@ -53,7 +53,7 @@
       keytab_service: toddlers
 
     - role: openshift/ipa-client
-      app: poddlers
+      ipa_client_app: poddlers
 
     - role: openshift/object
       object_app: poddlers

playbooks/openshift-apps/toddlers.yml

@@ -67,7 +67,7 @@
     keytab_service: toddlers
 
   - role: openshift/ipa-client
-    app: toddlers
+    ipa_client_app: toddlers
 
   - role: openshift/object
     object_app: toddlers

playbooks/openshift-apps/webhook2fedmsg.yml

@@ -100,7 +100,7 @@
 
     # FASJSON access
     - role: openshift/ipa-client
-      app: webhook2fedmsg
+      ipa_client_app: webhook2fedmsg
     - role: openshift/keytab
       keytab_app: webhook2fedmsg
       keytab_key: service.keytab

roles/openshift/ipa-client/tasks/main.yml

@@ -12,9 +12,9 @@
 - name: Copy ipa config template to temporary file
   template:
     src: "{{roles_path}}/openshift/ipa-client/templates/configmap.yml"
-    dest: "/etc/openshift_apps/{{app}}/configmap-ipa-client.yml"
+    dest: "/etc/openshift_apps/{{ipa_client_app}}/configmap-ipa-client.yml"
   register: object_template
 
 - name: Call `oc apply` on the copied file
-  shell: oc -n {{app}} apply -f /etc/openshift_apps/{{app}}/configmap-ipa-client.yml
+  shell: oc -n {{ipa_client_app}} apply -f /etc/openshift_apps/{{ipa_client_app}}/configmap-ipa-client.yml
   when: object_template.changed or object_template_fullpath.changed or object_file.changed