greenwave role: fix the OpenShift templates

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

@@ -1,94 +1,105 @@
 ---
-objects:
+apiVersion: v1
-- apiVersion: v1
+kind: DeploymentConfig
-  kind: DeploymentConfig
+metadata:
-  metadata:
+  name: greenwave-web
-    name: greenwave-web
+  labels:
-    labels:
+    app: greenwave
-      app: greenwave
+    service: web
-      service: web
+spec:
-  spec:
+  replicas: 2
-    replicas: 2
+  selector:
-    selector:
+    app: greenwave
-      app: greenwave
+    service: web
-      service: web
+  template:
-    template:
+    metadata:
-      metadata:
+      labels:
-        labels:
+        app: greenwave
-          app: greenwave
+        service: web
-          service: web
+    spec:
-      spec:
+      containers:
-        containers:
+      - name: web
-        - name: web
+        image: registry/greenwave:latest
-          image: registry/greenwave:latest
+        ports:
-          ports:
+        - containerPort: 8080
-          - containerPort: 8080
+        volumeMounts:
-          volumeMounts:
-          - name: config-volume
-            mountPath: /etc/greenwave
-            readOnly: true
-          readinessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 5
-            httpGet:
-              path: /healthcheck
-              port: 8080
-          livenessProbe:
-            timeoutSeconds: 1
-            initialDelaySeconds: 30
-            httpGet:
-              path: /healthcheck
-              port: 8080
-          resources:
-            limits:
-              memory: 384Mi
-        volumes:
         - name: config-volume
-          configMap:
+          mountPath: /etc/greenwave
-            name: greenwave-configmap
+          readOnly: true
-# For fedmsg consumers
+        readinessProbe:
-- apiVersion: v1
+          timeoutSeconds: 1
-  kind: DeploymentConfig
+          initialDelaySeconds: 5
-  metadata:
+          httpGet:
-    name: greenwave-fedmsg-consumers
+            path: /healthcheck
-    labels:
+            port: 8080
-      app: greenwave
+        livenessProbe:
-      service: fedmsg-consumers
+          timeoutSeconds: 1
-  spec:
+          initialDelaySeconds: 30
-    replicas: 1
+          httpGet:
-    selector:
+            path: /healthcheck
-      service: fedmsg-consumers
+            port: 8080
-    template:
+        resources:
-      metadata:
+          limits:
-        labels:
+            memory: 384Mi
-          app: greenwave
+      volumes:
-          service: fedmsg-consumers
+      - name: config-volume
-      spec:
+        configMap:
-        containers:
+          name: greenwave-configmap
-        - name: fedmsg-consumers
-          image: registry/greenwave:latest
-          ports:
-          - containerPort: 8081
-          command: /usr/bin/fedmsg-hub
-          volumeMounts:
-          - name: fedmsg-config-volume
-            mountPath: /etc/fedmsg.d
-            readOnly: true
-          resources:
-            limits:
-              memory: 384Mi
-        volumes:
-        - name: fedmsg-config-volume
-          configMap:
-            name: greenwave-fedmsg-configmap
   triggers:
   - type: ImageChange
     imageChangeParams:
       automatic: true
       containerNames:
       - web
+      from:
+        kind: ImageStreamTag
+        name: greenwave:latest
+  - type: ConfigChange
+---
+# For fedmsg consumers
+apiVersion: v1
+kind: DeploymentConfig
+metadata:
+  name: greenwave-fedmsg-consumers
+  labels:
+    app: greenwave
+    service: fedmsg-consumers
+spec:
+  replicas: 1
+  selector:
+    service: fedmsg-consumers
+  template:
+    metadata:
+      labels:
+        app: greenwave
+        service: fedmsg-consumers
+    spec:
+      containers:
+      - name: fedmsg-consumers
+        image: registry/greenwave:latest
+        ports:
+        - containerPort: 8081
+        command:
+        - '/usr/bin/fedmsg-hub'
+        volumeMounts:
+        - name: fedmsg-config-volume
+          mountPath: /etc/fedmsg.d
+          readOnly: true
+        resources:
+          limits:
+            memory: 384Mi
+      volumes:
+      - name: fedmsg-config-volume
+        configMap:
+          name: greenwave-fedmsg-configmap
+  triggers:
+  - type: ImageChange
+    imageChangeParams:
+      automatic: true
+      containerNames:
       - fedmsg-consumers
       from:
         kind: ImageStreamTag
         name: greenwave:latest
   - type: ConfigChange
+ 

roles/openshift-apps/greenwave/files/imagestream.yml

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: ImageStream
 metadata:

roles/openshift-apps/greenwave/files/route.yml

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: Route
 metadata:

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

@@ -1,30 +1,30 @@
 ---
-objects:
+apiVersion: v1
-- apiVersion: v1
+kind: Service
-  kind: Service
+metadata:
-  metadata:
+  name: greenwave-web
-    name: greenwave-web
+  labels:
-    labels:
+    app: greenwave
-      app: greenwave
+spec:
-  spec:
+  selector:
-    selector:
+    app: greenwave
-      app: greenwave
+    service: web
-      service: web
+  ports:
-    ports:
+  - name: web
-    - name: web
+    port: 8080
-      port: 8080
+    targetPort: 8080
-      targetPort: 8080
+---
-- apiVersion: v1
+apiVersion: v1
-  kind: Service
+kind: Service
-  metadata:
+metadata:
-    name: fedmsg-consumers
+  name: fedmsg-consumers
-    labels:
+  labels:
-      app: greenwave
+    app: greenwave
-  spec:
+spec:
-    selector:
+  selector:
-      app: greenwave
+    app: greenwave
-      service: fedmsg-consumers
+    service: fedmsg-consumers
-    ports:
+  ports:
-    - name: fedmsg-consumers
+  - name: fedmsg-consumers
-      port: 8081
+    port: 8081
-      targetPort: 8081
+    targetPort: 8081

roles/openshift-apps/greenwave/templates/buildconfig.yml

@@ -1,4 +1,3 @@
----
 apiVersion: v1
 kind: BuildConfig
 metadata: