Check for capabilities instead of openshift

ansibleplaybookbundle · Aug 24, 2018 · 60d0664 · 60d0664
1 parent 32b1b92
commit 60d0664
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/playbooks/deprovision.yml b/playbooks/deprovision.yml
@@ -1,7 +1,7 @@
 - connection: local
   gather_facts: false
   hosts: localhost
-  name: "Deprovision mediawiki-apb from {{ cluster }}"
+  name: "Deprovision mediawiki-apb"
   roles:
   - ansibleplaybookbundle.asb-modules
   - mediawiki-apb

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -5,10 +5,6 @@
     description: "0%: Starting"
   when: in_cluster
 
-- name: 'Set facts'
-  set_fact:
-    cluster: '{{ "openshift" if "openshift" in lookup("k8s", cluster_info="version") else "kubernetes" }}'
-
 - name: Validate Admin User and Password
   fail:
     msg: "Mediawiki Admin User and Password cannot be the same value!"
@@ -25,7 +21,7 @@
     - name: service.yaml.j2
     - name: pvc.yaml.j2
     - name: route.yaml.j2
-      apply: "{{ True if cluster == 'openshift' else False }}"
+      apply: "{{ True if 'route.openshift.io' in lookup('k8s', cluster_info='api_groups') else False }}"
     - name: deployment.yaml.j2
 
 - name: "Update last operation"

diff --git a/templates/deployment.yaml.j2 b/templates/deployment.yaml.j2
@@ -1,11 +1,11 @@
 ---
 
-{% if cluster == 'kubernetes' %}
-apiVersion: apps/v1
-kind: Deployment
-{% else %}
+{% if 'apps.openshift.io' in lookup('k8s', cluster_info='api_groups') %}
 apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
+{% else %}
+apiVersion: apps/v1
+kind: Deployment
 {% endif %}
 metadata:
   name: {{ app_name }}
@@ -15,15 +15,15 @@ metadata:
     service: {{ app_name }}
 spec:
   replicas: 1
-{% if cluster == 'kubernetes' %}
+{% if 'apps.openshift.io' in lookup('k8s', cluster_info='api_groups') %}
+  selector:
+    app: {{ app_name }}
+    service: {{ app_name }}
+{% else %}
   selector:
     matchLabels:
       app: {{ app_name }}
       service: {{ app_name }}
-{% else %}
-  selector:
-    app: {{ app_name }}
-    service: {{ app_name }}
 {% endif %}
   strategy:
     type: Recreate
@@ -47,12 +47,7 @@ spec:
             value: {{ mediawiki_admin_user }}
           - name: MEDIAWIKI_ADMIN_PASS
             value: {{ mediawiki_admin_pass }}
-{% if cluster == 'kubernetes' %}
-          - name: MEDIAWIKI_SITE_SERVER
-            valueFrom:
-              fieldRef:
-                fieldPath: status.podIP
-{% else %}
+{% if 'apps.openshift.io' in lookup('k8s', cluster_info='api_groups') %}
           - name: MEDIAWIKI_SITE_SERVER
             value: {{
               lookup(
@@ -63,6 +58,11 @@ spec:
                 resource_name=app_name
               ) | json_query("spec.host")
             }}
+{% else %}
+          - name: MEDIAWIKI_SITE_SERVER
+            valueFrom:
+              fieldRef:
+                fieldPath: status.podIP
 {% endif %}
         ports:
           - containerPort: 8080