mirrormanager: rationalize object names

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

playbooks/openshift-apps/mirrormanager.yml

@@ -123,7 +123,7 @@
     # Cron jobs
     - role: openshift/object
       app: mirrormanager
-      template: cron.yml
+      file: cron.yml
       objectname: cron.yml
 
     - role: openshift/start-build

roles/openshift-apps/mirrormanager/files/cron.yml

@@ -19,13 +19,13 @@ spec:
             image: mirrormanager:latest
             command: ["/opt/app-root/bin/mm2_generate-worldmap", "--output", "/var/www/mirrormanager-statistics/map/"]
             volumeMounts:
-              - name: mm-config
+              - name: config
                 mountPath: "/etc/mirrormanager"
                 readOnly: true
           volumes:
-            - name: mm-config
+            - name: config
               configMap:
-                name: mm-config
+                name: config
 ---
 apiVersion: batch/v1
 kind: CronJob
@@ -47,16 +47,16 @@ spec:
             image: mirrormanager:latest
             command: ["bash", "/opt/scripts/sync-crawler-logs.sh"]
             volumeMounts:
-              - name: mm-config
+              - name: config
                 mountPath: "/etc/mirrormanager"
                 readOnly: true
               - name: scripts
                 mountPath: "/opt/scripts"
                 readOnly: true
           volumes:
-            - name: mm-config
+            - name: config
               configMap:
-                name: mm-config
+                name: config
             - name: scripts
               configMap:
                 name: scripts

roles/openshift-apps/mirrormanager/files/deploymentconfig.yml

@@ -32,10 +32,10 @@ spec:
         ports:
         - containerPort: 8080
         volumeMounts:
-        - name: mm-config
+        - name: config
           mountPath: "/etc/mirrormanager"
           readOnly: true
-        - name: mm-secrets
+        - name: secrets
           mountPath: "/etc/mirrormanager-secrets"
           readOnly: true
         - name: statistics
@@ -86,10 +86,10 @@ spec:
         #     path: "/healthz/live"
         #     port: 8080
       volumes:
-      - name: mm-config
+      - name: config
         configMap:
-          name: mirrormanager
+          name: config
-      - name: mm-secrets
+      - name: secrets
         secret:
           secretName: secrets
       - name: statistics

roles/openshift-apps/mirrormanager/templates/configmap.yml

@@ -7,7 +7,7 @@ items:
 - apiVersion: v1
   kind: ConfigMap
   metadata:
-    name: mirrormanager
+    name: config
     labels:
       app: mirrormanager
   data: