From 87074cf3d96f915d7794573476cddace1a133ded Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
Date: Tue, 11 Apr 2017 13:30:23 +0200
Subject: [PATCH] Do not sync salt-cloud provided default configuration by
 default

As discussed in PR#305, these are defaults that even if they are
configurable as probably not suited to a majority of users and causes
delete/add output on highstate of user of the formula choses to use
the same file name.
---
 salt/cloud.sls                                               | 1 +
 salt/files/cloud.maps.d/{ec2.conf => _ec2.conf}              | 0
 salt/files/cloud.maps.d/{gce.conf => _gce.conf}              | 0
 salt/files/cloud.maps.d/{rsos.conf => _rsos.conf}            | 0
 salt/files/cloud.maps.d/{saltify.conf => _saltify.conf}      | 0
 salt/files/cloud.profiles.d/{ec2.conf => _ec2.conf}          | 0
 salt/files/cloud.profiles.d/{gce.conf => _gce.conf}          | 0
 salt/files/cloud.profiles.d/{rsos.conf => _rsos.conf}        | 0
 salt/files/cloud.profiles.d/{saltify.conf => _saltify.conf}  | 0
 salt/files/cloud.providers.d/{ec2.conf => _ec2.conf}         | 0
 salt/files/cloud.providers.d/{gce.conf => _gce.conf}         | 0
 salt/files/cloud.providers.d/{rsos.conf => _rsos.conf}       | 0
 salt/files/cloud.providers.d/{saltify.conf => _saltify.conf} | 0
 13 files changed, 1 insertion(+)
 rename salt/files/cloud.maps.d/{ec2.conf => _ec2.conf} (100%)
 rename salt/files/cloud.maps.d/{gce.conf => _gce.conf} (100%)
 rename salt/files/cloud.maps.d/{rsos.conf => _rsos.conf} (100%)
 rename salt/files/cloud.maps.d/{saltify.conf => _saltify.conf} (100%)
 rename salt/files/cloud.profiles.d/{ec2.conf => _ec2.conf} (100%)
 rename salt/files/cloud.profiles.d/{gce.conf => _gce.conf} (100%)
 rename salt/files/cloud.profiles.d/{rsos.conf => _rsos.conf} (100%)
 rename salt/files/cloud.profiles.d/{saltify.conf => _saltify.conf} (100%)
 rename salt/files/cloud.providers.d/{ec2.conf => _ec2.conf} (100%)
 rename salt/files/cloud.providers.d/{gce.conf => _gce.conf} (100%)
 rename salt/files/cloud.providers.d/{rsos.conf => _rsos.conf} (100%)
 rename salt/files/cloud.providers.d/{saltify.conf => _saltify.conf} (100%)

diff --git a/salt/cloud.sls b/salt/cloud.sls
index b78d522..85d2423 100644
--- a/salt/cloud.sls
+++ b/salt/cloud.sls
@@ -55,6 +55,7 @@ salt-cloud-{{ cloud_section }}:
     - source: {{ salt_settings.cloud.template_sources[cloud_section] }}
     - template: jinja
     - makedirs: True
+    - exclude_pat: _*
 
 {% for filename in salt['pillar.get']("salt:cloud:" ~ cloud_section, {}).keys() %}
 /etc/salt/cloud.{{ cloud_section }}.d/{{ filename }}:
diff --git a/salt/files/cloud.maps.d/ec2.conf b/salt/files/cloud.maps.d/_ec2.conf
similarity index 100%
rename from salt/files/cloud.maps.d/ec2.conf
rename to salt/files/cloud.maps.d/_ec2.conf
diff --git a/salt/files/cloud.maps.d/gce.conf b/salt/files/cloud.maps.d/_gce.conf
similarity index 100%
rename from salt/files/cloud.maps.d/gce.conf
rename to salt/files/cloud.maps.d/_gce.conf
diff --git a/salt/files/cloud.maps.d/rsos.conf b/salt/files/cloud.maps.d/_rsos.conf
similarity index 100%
rename from salt/files/cloud.maps.d/rsos.conf
rename to salt/files/cloud.maps.d/_rsos.conf
diff --git a/salt/files/cloud.maps.d/saltify.conf b/salt/files/cloud.maps.d/_saltify.conf
similarity index 100%
rename from salt/files/cloud.maps.d/saltify.conf
rename to salt/files/cloud.maps.d/_saltify.conf
diff --git a/salt/files/cloud.profiles.d/ec2.conf b/salt/files/cloud.profiles.d/_ec2.conf
similarity index 100%
rename from salt/files/cloud.profiles.d/ec2.conf
rename to salt/files/cloud.profiles.d/_ec2.conf
diff --git a/salt/files/cloud.profiles.d/gce.conf b/salt/files/cloud.profiles.d/_gce.conf
similarity index 100%
rename from salt/files/cloud.profiles.d/gce.conf
rename to salt/files/cloud.profiles.d/_gce.conf
diff --git a/salt/files/cloud.profiles.d/rsos.conf b/salt/files/cloud.profiles.d/_rsos.conf
similarity index 100%
rename from salt/files/cloud.profiles.d/rsos.conf
rename to salt/files/cloud.profiles.d/_rsos.conf
diff --git a/salt/files/cloud.profiles.d/saltify.conf b/salt/files/cloud.profiles.d/_saltify.conf
similarity index 100%
rename from salt/files/cloud.profiles.d/saltify.conf
rename to salt/files/cloud.profiles.d/_saltify.conf
diff --git a/salt/files/cloud.providers.d/ec2.conf b/salt/files/cloud.providers.d/_ec2.conf
similarity index 100%
rename from salt/files/cloud.providers.d/ec2.conf
rename to salt/files/cloud.providers.d/_ec2.conf
diff --git a/salt/files/cloud.providers.d/gce.conf b/salt/files/cloud.providers.d/_gce.conf
similarity index 100%
rename from salt/files/cloud.providers.d/gce.conf
rename to salt/files/cloud.providers.d/_gce.conf
diff --git a/salt/files/cloud.providers.d/rsos.conf b/salt/files/cloud.providers.d/_rsos.conf
similarity index 100%
rename from salt/files/cloud.providers.d/rsos.conf
rename to salt/files/cloud.providers.d/_rsos.conf
diff --git a/salt/files/cloud.providers.d/saltify.conf b/salt/files/cloud.providers.d/_saltify.conf
similarity index 100%
rename from salt/files/cloud.providers.d/saltify.conf
rename to salt/files/cloud.providers.d/_saltify.conf