[path] use standard salt path (/srv/salt) instead of /etc/salt/srv (closes #610256)
authorPaul Tonelli <paul.tonelli@logilab.fr>
Tue, 26 Nov 2013 17:48:59 +0100
changeset 181 52418fb97f5d
parent 180 fe8b24630837
child 182 46334bff1690
[path] use standard salt path (/srv/salt) instead of /etc/salt/srv (closes #610256)
ami_pre/files.sls
docs/how-it-works.rst
docs/using-on-local-machine.rst
minion
others/ec2-run-user-data
others/rc.local
update.sls
variation.minion
--- a/ami_pre/files.sls	Thu Jul 25 15:12:30 2013 +0200
+++ b/ami_pre/files.sls	Tue Nov 26 17:48:59 2013 +0100
@@ -118,7 +118,7 @@
 {% if 'ami.hg_rev_variation' in grains %}
         - rev: {{ grains['ami.hg_rev_variation'] }}
 {% endif %}
-        - target: /mnt/variation/etc/salt/srv
+        - target: /mnt/variation/srv/salt
         - require:
             - mount.mounted: mounted_variation
 
--- a/docs/how-it-works.rst	Thu Jul 25 15:12:30 2013 +0200
+++ b/docs/how-it-works.rst	Tue Nov 26 17:48:59 2013 +0100
@@ -9,7 +9,7 @@
 
 .. code-block:: bash
 
-  /usr/bin/env python /etc/salt/srv/others/ec2_ami_parser.py
+  /usr/bin/env python /srv/salt/others/ec2_ami_parser.py
 
 By default this script loads from the user_data supplied to your virtual machine 
 through OpenStack or Amazon. You can *manually* extract user_data from a config 
--- a/docs/using-on-local-machine.rst	Thu Jul 25 15:12:30 2013 +0200
+++ b/docs/using-on-local-machine.rst	Tue Nov 26 17:48:59 2013 +0100
@@ -37,19 +37,19 @@
 
 .. code-block:: bash
 
-  root@machine~# hg clone http://hg.logilab.org/master/salt-ami-cloud-builder/ /etc/salt/srv
+  root@machine~# hg clone http://hg.logilab.org/master/salt-ami-cloud-builder/ /srv
 
 Copy the necessary scripts so the ami creation process is launched at boot:
 
 .. code-block:: bash
 
-  root@machine~# cp /etc/salt/srv/others/rc.local /etc/rc.local
+  root@machine~# cp /srv/salt/others/rc.local /etc/rc.local
 
 and copy the configuration to make salt-minion masterless:
 
 .. code-block:: bash
 
-  root@machine~# cp /etc/salt/srv/minion /etc/salt/
+  root@machine~# cp /srv/salt/minion /etc/salt/
 
 save this machine as an ami-creator image and you can then use it by simply
 adding relevant user data at boot
--- a/minion	Thu Jul 25 15:12:30 2013 +0200
+++ b/minion	Tue Nov 26 17:48:59 2013 +0100
@@ -25,5 +25,5 @@
 
 file_roots:
   base:
-    - /etc/salt/srv
+    - /srv/salt
 
--- a/others/ec2-run-user-data	Thu Jul 25 15:12:30 2013 +0200
+++ b/others/ec2-run-user-data	Tue Nov 26 17:48:59 2013 +0100
@@ -18,7 +18,7 @@
 prog=$(basename $0)
 logger="logger -t $prog"
 instance_data_url="http://169.254.169.254/2008-02-01"
-python_handler=/etc/salt/srv/others/ec2_ami_parser.py
+python_handler=/srv/salt/others/ec2_ami_parser.py
 
 
 # Retrieve the instance user-data and run it if it looks like a script
--- a/others/rc.local	Thu Jul 25 15:12:30 2013 +0200
+++ b/others/rc.local	Tue Nov 26 17:48:59 2013 +0100
@@ -13,7 +13,7 @@
 
 ### Specific to salt-call machine creation
 ## parse the user-data for ami related information
-/usr/bin/env python /etc/salt/srv/others/ec2_ami_parser.py
+/usr/bin/env python /srv/salt/others/ec2_ami_parser.py
 
 ## get updated code if necessary 
 for i in `seq 3`
--- a/update.sls	Thu Jul 25 15:12:30 2013 +0200
+++ b/update.sls	Tue Nov 26 17:48:59 2013 +0100
@@ -44,7 +44,7 @@
 {% if 'ami.hg_rev_server' in grains %}
         - rev: {{ grains['ami.hg_rev_server'] }}
 {% endif %}
-        - target: /etc/salt/srv
+        - target: /srv
         - require:
             - pkg: my_pkgs
 {% endif %}
--- a/variation.minion	Thu Jul 25 15:12:30 2013 +0200
+++ b/variation.minion	Tue Nov 26 17:48:59 2013 +0100
@@ -20,6 +20,6 @@
 
 file_roots:
   base:
-    - /etc/salt/srv
+    - /srv/salt