oraculum: More shuffling

playbooks/openshift-apps/packager-dashboard.yml

@@ -85,7 +85,7 @@
     routename: packager-dashboard
     host: "packager-dashboard{{ env_suffix }}.fedoraproject.org"
     serviceport: 5000-tcp
-    servicename: packager-dashboard
+    servicename: oraculum-api-endpoint
 
   - role: openshift/start-build
     app: oraculum

roles/openshift-apps/oraculum/files/service.yml

@@ -4,7 +4,7 @@ kind: Service
 metadata:
   labels:
     app: oraculum
-  name: packager-dashboard
+  name: oraculum-api-endpoint
 spec:
   ports:
   - name: 5000-tcp
@@ -13,14 +13,14 @@ spec:
     targetPort: 8080
   selector:
     app: oraculum
-    deploymentconfig: oraculum
+    deploymentconfig: oraculum-api-endpoint
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
     app: oraculum
-  name: packager-dashboard-redis
+  name: oraculum-redis
 spec:
   ports:
   - name: 6379-tcp
@@ -29,4 +29,4 @@ spec:
     targetPort: 6379
   selector:
     app: oraculum
-    deploymentconfig: oraculum
+    deploymentconfig: oraculum-redis

roles/openshift-apps/oraculum/templates/deploymentconfig.yml

@@ -4,7 +4,7 @@ kind: DeploymentConfig
 metadata:
   labels:
     app: oraculum
-    service: oraculum
+    service: oraculum-api-endpoint
   name: oraculum-api-endpoint
 spec:
   replicas: 1
@@ -102,7 +102,6 @@ kind: DeploymentConfig
 metadata:
   labels:
     app: oraculum
-    service: oraculum
   name: oraculum-worker
 spec:
   replicas: 1 # Change me to some biiig numba after you got me working
@@ -183,7 +182,6 @@ kind: DeploymentConfig
 metadata:
   labels:
     app: oraculum
-    service: oraculum
   name: oraculum-beat
 spec:
   replicas: 1 # Never change this to more or less than ONE!
@@ -263,22 +261,22 @@ apiVersion: v1
 kind: DeploymentConfig
 metadata:
   labels:
-    app: packager-dashboard
+    app: oraculum
-    service: packager-dashboard
+    service: oraculum-redis
-  name: packager-dashboard-redis
+  name: oraculum-redis
 spec:
   replicas: 1 # Never change this to more or less than ONE!
   selector:
-    app: packager-dashboard
+    app: oraculum
-    deploymentconfig: packager-dashboard
+    deploymentconfig: oraculum-redis
   template:
     metadata:
       labels:
-        app: packager-dashboard
+        app: oraculum
-        deploymentconfig: packager-dashboard
+        deploymentconfig: oraculum-redis
     spec:
       containers:
-      - name: packager-dashboard-redis
+      - name: oraculum-redis
         image: packager-dashboard-redis:latest
         resources: {}
         env:
@@ -290,7 +288,7 @@ spec:
     imageChangeParams:
       automatic: true
       containerNames:
-      - packager-dashboard-redis
+      - oraculum-redis
       from:
         kind: ImageStreamTag
         name: packager-dashboard-redis:latest