Reduce implicit coupling between cookbooks

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 0e994e71c8dd8d3caf2d262a271b07f7ffb963bb..9b9a4c03cd85516739f255aed256a66fbbe4eba8 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -40,7 +40,6 @@ suites:
         clients: none
   - name: blogs
     run_list:
-      - recipe[accounts::default]
       - recipe[blogs::default]
   - name: clamav
     run_list:
@@ -74,8 +73,7 @@ suites:
         mpm: prefork
   - name: donate
     run_list:
-      - recipe[accounts::default]
-      - role[donate]
+      - recipe[donate::default]
     attributes:
       apache:
         mpm: prefork
@@ -87,17 +85,24 @@ suites:
       - recipe[fail2ban::default]
   - name: forum
     run_list:
-      - recipe[accounts::default]
-      - role[forum]
+      - recipe[forum::default]
+    attributes:
+      apache:
+        mpm: prefork
+  - name: incron
+    run_list:
+      - recipe[incron::default]
   - name: letsencrypt
     run_list:
-      - recipe[accounts::default]
-      - recipe[apt::default]
       - role[letsencrypt]
     attributes:
       apt:
         sources:
           - openstreetmap
+  - name: memcached
+    run_list:
+      - recipe[munin::default]
+      - recipe[memcached::default]
   - name: munin
     run_list:
       - recipe[munin::default]
@@ -110,23 +115,56 @@ suites:
   - name: networking
     run_list:
       - recipe[networking::default]
+  - name: nginx
+    run_list:
+      - recipe[munin::default]
+      - recipe[nginx::default]
+    attributes:
+      networking:
+        nameservers:
+          - 127.0.0.1
+  - name: nodejs
+    run_list:
+      - recipe[nodejs::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]
   - name: openssh
     run_list:
       - recipe[openssh::default]
+  - name: osmosis
+    run_list:
+      - recipe[osmosis::default]
   - name: otrs
     run_list:
-      - recipe[accounts::default]
-      - recipe[chef::default]
-      - role[otrs]
+      - recipe[otrs::default]
+  - name: planet
+    run_list:
+      - recipe[planet::default]
+  - name: planet-dump
+    run_list:
+      - recipe[planet::dump]
+  - name: planet-notes
+    run_list:
+      - recipe[planet::notes]
+    attributes:
+      web:
+        readonly_database_host: readonly
+  - name: planet-replication
+    run_list:
+      - recipe[planet::replication]
+    attributes:
+      web:
+        readonly_database_host: readonly
   - name: python
     run_list:
       - recipe[python::default]
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]
+  - name: squid
+    run_list:
+      - recipe[squid::default]
   - name: tools
     run_list:
       - recipe[tools::default]