Merge lp:~tyler-baker/lava-lab/salt-clean-up into lp:lava-lab

[Tyler Baker]

General cleanup of the top.sls + adding LAVA coordinator to production.

# Dispatchers

# Production Dispatchers

# Staging Dispatchers

# Other

[lp:~tyler-baker/lava-lab/salt-clean-up]

291. By Tyler Baker on 2013-09-03

Add comments

[Matthew Hart (matthew-hart)]

Looks good to me

review: Approve

=== added directory 'lava/production-coordinator'
=== added file 'lava/production-coordinator/init.sls'
--- lava/production-coordinator/init.sls	1970-01-01 00:00:00 +0000
+++ lava/production-coordinator/init.sls	2013-09-03 16:34:13 +0000
@@ -0,0 +1,13 @@
+# installs lava coordinator config file ((production)
+
+/etc/lava-coordinator/:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+
+/etc/lava-coordinator/lava-coordinator.conf:
+  file.managed:
+    - source: salt://lava/production-coordinator/lava-coordinator.conf
+    - owner: root
+    - mode: 644

=== added file 'lava/production-coordinator/lava-coordinator.conf'
--- lava/production-coordinator/lava-coordinator.conf	1970-01-01 00:00:00 +0000
+++ lava/production-coordinator/lava-coordinator.conf	2013-09-03 16:34:13 +0000
@@ -0,0 +1,6 @@
+{
+    "port": 3079,
+    "blocksize": 4096,
+    "poll_delay": 3,
+    "coordinator_hostname": "control"
+}

=== added directory 'lava/staging-coordinator'
=== added file 'lava/staging-coordinator/init.sls'
--- lava/staging-coordinator/init.sls	1970-01-01 00:00:00 +0000
+++ lava/staging-coordinator/init.sls	2013-09-03 16:34:13 +0000
@@ -0,0 +1,13 @@
+# installs lava coordinator config file (staging)
+
+/etc/lava-coordinator/:
+  file.directory:
+    - user: root
+    - group: root
+    - mode: 755
+
+/etc/lava-coordinator/lava-coordinator.conf:
+  file.managed:
+    - source: salt://lava/staging-coordinator/lava-coordinator.conf
+    - owner: root
+    - mode: 644

=== added file 'lava/staging-coordinator/lava-coordinator.conf'
--- lava/staging-coordinator/lava-coordinator.conf	1970-01-01 00:00:00 +0000
+++ lava/staging-coordinator/lava-coordinator.conf	2013-09-03 16:34:13 +0000
@@ -0,0 +1,6 @@
+{
+    "port": 3079,
+    "blocksize": 4096,
+    "poll_delay": 3,
+    "coordinator_hostname": "staging"
+}

=== removed directory 'staging-coordinator'
=== removed file 'staging-coordinator/init.sls'
--- staging-coordinator/init.sls	2013-08-29 16:12:03 +0000
+++ staging-coordinator/init.sls	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-# installs lava coordinator config file (staging)
-
-/etc/lava-coordinator/:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 755
-
-/etc/lava-coordinator/lava-coordinator.conf:
-  file.managed:
-    - source: salt://staging-coordinator/lava-coordinator.conf
-    - owner: root
-    - mode: 644

=== removed file 'staging-coordinator/lava-coordinator.conf'
--- staging-coordinator/lava-coordinator.conf	2013-08-29 15:57:37 +0000
+++ staging-coordinator/lava-coordinator.conf	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-{
-    "port": 3079,
-    "blocksize": 4096,
-    "poll_delay": 3,
-    "coordinator_hostname": "staging"
-}

=== modified file 'top.sls'
--- top.sls	2013-08-30 14:52:43 +0000
+++ top.sls	2013-09-03 16:34:13 +0000
@@ -4,7 +4,7 @@
     - lp_users
     - nagios
 
-  'control,staging,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,dispatcher01,dispatcher02,hackbox,multinode,staging01,playgroundmaster,playgroundworker01':
+### dispatchers 'control,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,dispatcher01,dispatcher02,hackbox,multinode,playgroundmaster,playgroundworker01,staging,staging01':
     - match: list
     - instance_manager
     - nfs
@@ -13,17 +13,22 @@
     - tftpd-hpa
     - lava
 
+### production
   'control':
     - lava.webinterface
     - lava.munin
 
+  'control,fastmodels01,fastmodels02,fastmodels03,fastmodels04,fastmodels05,fastmodels06,dispatcher01,dispatcher02':
+    - lava.production-coordinator
+
+  'fastmodels*':
+    - match: pcre
+    - lava.fastmodels
+
+### staging
   'staging':
     - lava.webinterface
 
   'staging*':
     - lava.fastmodels
-    - staging-coordinator
-
-  'fastmodels*':
-    - match: pcre
-    - lava.fastmodels
+    - lava.staging-coordinator