only use proxy if working on openstack (if keystone is set, we want to upload to glance, therefore we are on openstack)
authorPaul Tonelli <paul.tonelli@logilab.fr>
Tue, 26 Mar 2013 14:54:47 +0100
changeset 107 bbbd2e0ec71b
parent 106 0ae1c1b51230
child 108 05f01e1d3341
only use proxy if working on openstack (if keystone is set, we want to upload to glance, therefore we are on openstack)
ami_pre/files.sls
--- a/ami_pre/files.sls	Tue Mar 26 14:30:17 2013 +0100
+++ b/ami_pre/files.sls	Tue Mar 26 14:54:47 2013 +0100
@@ -1,3 +1,4 @@
+{% if 'keystone.user' in grains %}
 01proxy:
     file.managed:
         - name: /mnt/variation/etc/apt/apt.conf.d/01proxy
@@ -5,6 +6,7 @@
         - mode: 644
         - require:
             - mount.mounted: mounted_variation
+{% endif %}
 
 02confold:
     file.managed: