From f7054c12f757485de6013925fa444fa56bfa1853 Mon Sep 17 00:00:00 2001
From: Francois Andrieu <darknao@fedoraproject.org>
Date: Sat, 20 Mar 2021 19:42:39 +0100
Subject: [PATCH] languages: remove registry variable

---
 roles/openshift-apps/languages/defaults/main.yml  |  1 -
 roles/openshift-apps/languages/templates/cron.yml | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 roles/openshift-apps/languages/defaults/main.yml

diff --git a/roles/openshift-apps/languages/defaults/main.yml b/roles/openshift-apps/languages/defaults/main.yml
deleted file mode 100644
index b14a313dba..0000000000
--- a/roles/openshift-apps/languages/defaults/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-registry: "docker-registry.default.svc:5000"
diff --git a/roles/openshift-apps/languages/templates/cron.yml b/roles/openshift-apps/languages/templates/cron.yml
index f9abe2629b..4d506c1cf4 100644
--- a/roles/openshift-apps/languages/templates/cron.yml
+++ b/roles/openshift-apps/languages/templates/cron.yml
@@ -19,7 +19,7 @@ spec:
         spec:
           containers:
           - name: extract
-            image: "{{ registry }}/{{ app }}/builder:f33"
+            image: "docker-registry.default.svc:5000/languages/builder:f33"
             imagePullPolicy: Always
             command:
             - ./build.py
@@ -56,7 +56,7 @@ spec:
         spec:
           containers:
           - name: extract
-            image: "{{ registry }}/{{ app }}/builder:latest"
+            image: "docker-registry.default.svc:5000/languages/builder:latest"
             imagePullPolicy: Always
             command:
             - ./build.py
@@ -98,7 +98,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: stats
-            image: "{{ registry }}/{{ app }}/builder:latest"
+            image: "docker-registry.default.svc:5000/languages/builder:latest"
             imagePullPolicy: Always
             command: ["/bin/sh", "-c"]
             args:
@@ -138,7 +138,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: stats
-            image: "{{ registry }}/{{ app }}/builder:latest"
+            image: "docker-registry.default.svc:5000/languages/builder:latest"
             imagePullPolicy: Always
             command: ["/bin/sh", "-c"]
             args:
@@ -177,7 +177,7 @@ spec:
           restartPolicy: Never
           containers:
           - name: stats
-            image: "{{ registry }}/{{ app }}/builder:latest"
+            image: "docker-registry.default.svc:5000/languages/builder:latest"
             imagePullPolicy: Always
             command: ["/bin/sh", "-c"]
             args: