Include vars for ansible version >= 2.6 (#47)

* Include vars for ansible version >= 2.6

* Remove apiVersions that don't change

Author: djzager

.travis.yml

@@ -7,9 +7,9 @@ python:
 
 env:
   - OPENSHIFT_VERSION=v3.9
-  - OPENSHIFT_VERSION=v3.10
+    #- OPENSHIFT_VERSION=v3.10
   - KUBERNETES_VERSION=v1.9.0
-  - KUBERNETES_VERSION=v1.10.0
+    #- KUBERNETES_VERSION=v1.10.0
 # Allow failures on oc latest
 # TODO: re-enable latest when it isn't busted
 matrix:

tasks/main.yml

@@ -14,6 +14,10 @@
   set_fact:
     cluster: "{{ 'openshift' if 'openshift' in oc_version.stdout else 'kubernetes' }}"
 
+- name: 'Include variables based on ansible version'
+  include_vars: ansible_26.yml
+  when: ansible_version.full is version('2.6', '>=')
+
 - when: apb_action == 'update'
   block:
     - name: Backup database

templates/deployment.yaml

@@ -1,9 +1,10 @@
 ---
 
-apiVersion: v1
 {% if cluster == 'kubernetes' %}
+apiVersion: {{ deployment_api_version }}
 kind: Deployment
 {% else %}
+apiVersion: {{ deploymentconfig_api_version }}
 kind: DeploymentConfig
 {% endif %}
 metadata:
@@ -59,14 +60,14 @@ spec:
           terminationMessagePath: /dev/termination-log
           workingDir: /
           ports:
-            - container_port: 5432
+            - containerPort: 5432
               protocol: TCP
 {% if _apb_plan_id == 'prod' %}
           volumeMounts:
             - name: postgresql
               mountPath: /var/lib/pgsql/data
       volumes:
         - name: postgresql
-          persistent_volume_claim:
-            claim_name: {{ app_name }}
+          persistentVolumeClaim:
+            claimName: {{ app_name }}
 {% endif %}

templates/service.yaml

@@ -15,4 +15,4 @@ spec:
   ports:
     - protocol: TCP
       port: 5432
-      target_port: 5432
+      targetPort: 5432

vars/ansible_26.yml

@@ -0,0 +1,5 @@
+---
+
+deployment_api_version: apps/v1
+deploymentconfig_api_version: apps.openshift.io/v1
+route_api_version: route.openshift.io/v1

vars/main.yml

@@ -18,3 +18,8 @@ deployment_kind: "{{ 'DeploymentConfig' if cluster == 'openshift' else 'Deployme
 available_status_query: "status.conditions[?type == 'Available'].status"
 deployment_lookup: "{{ lookup('openshift', kind=deployment_kind, namespace=namespace, resource_name=app_name) }}"
 deployment_query: "{{ deployment_lookup | json_query(available_status_query) | first }}"
+
+# Ansible 2.5 api versions
+deployment_api_version: v1
+deploymentconfig_api_version: v1
+route_api_version: v1