removed definition of defaults grains from file: this behavior required two highstates to work and this is bad. Instead, the default state is now to have no grains defined by default and act accordingly
authorPaul Tonelli <paul.tonelli@logilab.fr>
Tue, 26 Mar 2013 09:18:44 +0100
changeset 98 032c0fd12892
parent 97 ae24ced33f8e
child 99 bc524028cdc2
removed definition of defaults grains from file: this behavior required two highstates to work and this is bad. Instead, the default state is now to have no grains defined by default and act accordingly also added vim package in ami_creator, it is easier to debug
update.sls
--- a/update.sls	Tue Mar 26 10:35:03 2013 +0100
+++ b/update.sls	Tue Mar 26 09:18:44 2013 +0100
@@ -7,24 +7,7 @@
       - tar
       - rsync
       - glance
-
-{% if 'ami.type' not in grains %}
-ami.type:
-    grains.present:
-        - value: debian
-{% endif %}
-
-{% if 'ami.hg_address_server' not in grains %}
-ami.hg_address_server:
-    grains.present:
-        - value: http://hg.logilab.org/users/ptonelli/ami_creator/server
-{% endif %}
-
-{% if 'ami.hg_address_variation' not in grains %}
-ami.hg_address_variation:
-    grains.present:
-        - value: http://hg.logilab.org/users/ptonelli/ami_creator/variation
-{% endif %}
+      - vim
 
 {% if 'ami.hg_address_server' in grains %}
 hg_code: