diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml index 847607bd2b..1b840236a3 100644 --- a/playbooks/openshift-apps/badges.yml +++ b/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 diff --git a/playbooks/openshift-apps/bugzilla2fedmsg.yml b/playbooks/openshift-apps/bugzilla2fedmsg.yml index cce9e4413b..a03028c081 100644 --- a/playbooks/openshift-apps/bugzilla2fedmsg.yml +++ b/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 diff --git a/playbooks/openshift-apps/elections.yml b/playbooks/openshift-apps/elections.yml index 8557947d07..284f6a8bb2 100644 --- a/playbooks/openshift-apps/elections.yml +++ b/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 diff --git a/playbooks/openshift-apps/fasjson.yml b/playbooks/openshift-apps/fasjson.yml index 9469ed5cc9..25cbf7b0af 100644 --- a/playbooks/openshift-apps/fasjson.yml +++ b/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 diff --git a/playbooks/openshift-apps/fmn.yml b/playbooks/openshift-apps/fmn.yml index ee966f69c3..244df80aa7 100644 --- a/playbooks/openshift-apps/fmn.yml +++ b/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 diff --git a/playbooks/openshift-apps/kerneltest.yml b/playbooks/openshift-apps/kerneltest.yml index ffb9b1a3ce..8efc44804b 100644 --- a/playbooks/openshift-apps/kerneltest.yml +++ b/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 diff --git a/playbooks/openshift-apps/maubot.yml b/playbooks/openshift-apps/maubot.yml index e782080c0d..9b8d039cfe 100644 --- a/playbooks/openshift-apps/maubot.yml +++ b/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 diff --git a/playbooks/openshift-apps/noggin-centos.yml b/playbooks/openshift-apps/noggin-centos.yml index 934252ad9c..ee239fd444 100644 --- a/playbooks/openshift-apps/noggin-centos.yml +++ b/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 diff --git a/playbooks/openshift-apps/noggin.yml b/playbooks/openshift-apps/noggin.yml index 5395804ed8..8c394e0b3d 100644 --- a/playbooks/openshift-apps/noggin.yml +++ b/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 diff --git a/playbooks/openshift-apps/planet.yml b/playbooks/openshift-apps/planet.yml index 896149f2bb..2d0d37c635 100644 --- a/playbooks/openshift-apps/planet.yml +++ b/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 diff --git a/playbooks/openshift-apps/poddlers.yml b/playbooks/openshift-apps/poddlers.yml index 41416b42e3..06a77ad3de 100644 --- a/playbooks/openshift-apps/poddlers.yml +++ b/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 diff --git a/playbooks/openshift-apps/toddlers.yml b/playbooks/openshift-apps/toddlers.yml index dddf3f67e4..8427d27391 100644 --- a/playbooks/openshift-apps/toddlers.yml +++ b/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 diff --git a/playbooks/openshift-apps/webhook2fedmsg.yml b/playbooks/openshift-apps/webhook2fedmsg.yml index b1751ba0d2..233078f746 100644 --- a/playbooks/openshift-apps/webhook2fedmsg.yml +++ b/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 diff --git a/roles/openshift/ipa-client/tasks/main.yml b/roles/openshift/ipa-client/tasks/main.yml index ca99af6d10..e8235706f4 100644 --- a/roles/openshift/ipa-client/tasks/main.yml +++ b/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