From e26b805279dda14218aed3b132c64e3863193700 Mon Sep 17 00:00:00 2001
From: John Galt <centromere@users.noreply.github.com>
Date: Thu, 31 Mar 2016 23:17:35 -0700
Subject: [PATCH] Added version check for provider/driver backwards
 compatibility

---
 salt/files/cloud.providers.d/ec2.conf     | 4 ++++
 salt/files/cloud.providers.d/gce.conf     | 4 ++++
 salt/files/cloud.providers.d/rsos.conf    | 4 ++++
 salt/files/cloud.providers.d/saltify.conf | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/salt/files/cloud.providers.d/ec2.conf b/salt/files/cloud.providers.d/ec2.conf
index 003fa5b..1413166 100644
--- a/salt/files/cloud.providers.d/ec2.conf
+++ b/salt/files/cloud.providers.d/ec2.conf
@@ -15,5 +15,9 @@ ec2_ubuntu_public:
   location: eu-west-1
   availability_zone: eu-west-1a
   ssh_username: ubuntu
+  {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %}
   driver: ec2
+  {%- else %}
+  provider: ec2
+  {%- endif %}
 {%- endif %}
diff --git a/salt/files/cloud.providers.d/gce.conf b/salt/files/cloud.providers.d/gce.conf
index 5a409e8..57278ee 100644
--- a/salt/files/cloud.providers.d/gce.conf
+++ b/salt/files/cloud.providers.d/gce.conf
@@ -10,5 +10,9 @@ gce:
     master: {{ cloud.get('master', 'salt') }}
   grains:
     test: True
+  {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %}
   driver: gce
+  {%- else %}
+  provider: gce
+  {%- endif %}
 {%- endif %}
diff --git a/salt/files/cloud.providers.d/rsos.conf b/salt/files/cloud.providers.d/rsos.conf
index 801717d..3734e36 100644
--- a/salt/files/cloud.providers.d/rsos.conf
+++ b/salt/files/cloud.providers.d/rsos.conf
@@ -14,7 +14,11 @@ rsos_{{ region|lower }}:
   compute_name: cloudServersOpenStack
   protocol: ipv4
   compute_region: {{ region }}
+  {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %}
   driver: openstack
+  {%- else %}
+  provider: openstack
+  {%- endif %}
   user:  {{ cloud.get('rsos_user', 'DEFAULT') }}
   tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }}
   apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }}
diff --git a/salt/files/cloud.providers.d/saltify.conf b/salt/files/cloud.providers.d/saltify.conf
index 23e4dae..4ff5b1b 100644
--- a/salt/files/cloud.providers.d/saltify.conf
+++ b/salt/files/cloud.providers.d/saltify.conf
@@ -3,6 +3,10 @@
 {% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
 
 saltify:
+  {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %}
   driver: saltify
+  {%- else %}
+  provider: saltify
+  {%- endif %}
   minion:
     master: {{ cloud.get('master', 'salt') }}