From 7e074dc37917a9c70a29cfa49eb8fe1b8d21b38b Mon Sep 17 00:00:00 2001
From: Andrew Vant <andrew.vant@rackspace.com>
Date: Fri, 3 Apr 2015 18:47:08 -0400
Subject: [PATCH] Supplied default values for all pillar queries in provider
 templates.

These aren't intended to function; they're here to allow the use of
file.recurse on the provider folder, without requiring the user
to provide pillar data for templates they're not using.
---
 salt/files/cloud.providers.d/ec2.conf     | 6 +++---
 salt/files/cloud.providers.d/gce.conf     | 6 +++---
 salt/files/cloud.providers.d/rsos.conf    | 8 ++++----
 salt/files/cloud.providers.d/saltify.conf | 5 ++++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/salt/files/cloud.providers.d/ec2.conf b/salt/files/cloud.providers.d/ec2.conf
index fddf6b7..9afbcf3 100644
--- a/salt/files/cloud.providers.d/ec2.conf
+++ b/salt/files/cloud.providers.d/ec2.conf
@@ -2,12 +2,12 @@
 {% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
 ec2_ubuntu_public:
   minion:
-    master: {{ cloud['master'] }}
+    master: {{ cloud.get('master', 'salt') }}
   grains:
     test: True
   ssh_interface: public_ips
-  id: {{ cloud['aws_key'] }}
-  key: '{{ cloud['aws_secret'] }}'
+  id: {{ cloud.get('aws_key', 'DEFAULT') }}
+  key: '{{ cloud.get('aws_secret', 'DEFAULT') }}'
   private_key: /etc/salt/cloud.providers.d/key/key.pem
   keyname: keyname
   location: eu-west-1
diff --git a/salt/files/cloud.providers.d/gce.conf b/salt/files/cloud.providers.d/gce.conf
index 5313dfb..6b90bfb 100644
--- a/salt/files/cloud.providers.d/gce.conf
+++ b/salt/files/cloud.providers.d/gce.conf
@@ -1,11 +1,11 @@
 # This file managed by Salt, do not edit by hand!!
 {% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
 gce:
-  project: "{{ cloud['gce_project'] }}"
-  service_account_email_address: "{{ cloud['gce_service_account_email_address'] }}"
+  project: "{{ cloud.get('gce_project', 'DEFAULT') }}"
+  service_account_email_address: "{{ cloud.get('gce_service_account_email_address', 'DEFAULT') }}"
   service_account_private_key: "/etc/salt/cloud.providers.d/key.pem"
   minion:
-    master: {{ cloud['master'] }}
+    master: {{ cloud.get('master', 'salt') }}
   grains:
     test: True
   provider: gce
diff --git a/salt/files/cloud.providers.d/rsos.conf b/salt/files/cloud.providers.d/rsos.conf
index d3d6aa7..4bd41f1 100644
--- a/salt/files/cloud.providers.d/rsos.conf
+++ b/salt/files/cloud.providers.d/rsos.conf
@@ -6,7 +6,7 @@
 
 rsos_{{ region|lower }}:
   minion:
-    master: {{ cloud['master'] }}
+    master: {{ cloud.get('master', 'salt') }}
   grains:
     region: {{ region|lower }}
 
@@ -15,7 +15,7 @@ rsos_{{ region|lower }}:
   protocol: ipv4
   compute_region: {{ region }}
   provider: openstack
-  user:  {{ cloud['rsos_user'] }}
-  tenant: {{ cloud['rsos_tenant'] }}
-  apikey: {{ cloud['rsos_apikey'] }}
+  user:  {{ cloud.get('rsos_user', 'DEFAULT') }}
+  tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }}
+  apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }}
 {% endfor %}
diff --git a/salt/files/cloud.providers.d/saltify.conf b/salt/files/cloud.providers.d/saltify.conf
index 4fcff65..97cc2d5 100644
--- a/salt/files/cloud.providers.d/saltify.conf
+++ b/salt/files/cloud.providers.d/saltify.conf
@@ -1,5 +1,8 @@
 # This file is managed by Salt via {{ source }}
+
+{% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
+
 saltify:
   provider: saltify
   minion:
-    master: {{ cloud['master'] }}
+    master: {{ cloud.get('master', 'salt') }}