ec2/gce profiles/providers are no longer configured if they are not used.

Needed because salt-cloud will attempt to load them even if they are
filled with invalid default values, creating error spam.

salt/files/cloud.profiles.d/ec2.conf

@@ -1,4 +1,6 @@
 # This file managed by Salt, do not edit by hand!!
+{% set cloud = salt['pillar.get']('salt:cloud', {}) -%}
+{% if 'aws_key' in cloud %}
 base_ubuntu_ec2:
   provider: ec2_ubuntu_public
   image: ami-cb4986bc
@@ -13,4 +15,5 @@ base_ubuntu_ec2:
       SecurityGroupId:
         - sg-6ec11d3b
   tag: {'Environment': 'production', 'Role': 'ubuntu'}
-  sync_after_install: grains
+  sync_after_install: grains
+{% endif %}

salt/files/cloud.profiles.d/gce.conf

@@ -1,4 +1,6 @@
 # This file managed by Salt, do not edit by hand!!
+{%- set cloud = salt['pillar.get']('salt:cloud', {}) -%}
+{%- if 'gce_project' in cloud %}
 base_debian_gce:
   image: debian-7-wheezy
   size: g1-small
@@ -10,4 +12,5 @@ base_debian_gce:
   delete_boot_pd: True
   deploy: True
   make_master: False
-  provider: gce
+  provider: gce
+{%- endif %}