Merge remote-tracking branch 'github/pull/485'

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 9b9a4c03cd85516739f255aed256a66fbbe4eba8..126f95338651efbe2333801835712e309b03deea 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -1,22 +1,26 @@
 ---
 driver:
   name: dokken
 ---
 driver:
   name: dokken

-  chef_version: 14
+  chef_version: 17
+  env:
+    - container=dokken

 
 transport:
   name: dokken
 
 provisioner:
   name: dokken
 
 transport:
   name: dokken
 
 provisioner:
   name: dokken

+  chef_license: accept

   data_bags_path: test/data_bags
 
 verifier:
   root_path: /opt/verifier
   data_bags_path: test/data_bags
 
 verifier:
   root_path: /opt/verifier

+  sudo: false

 
 platforms:
 
 platforms:

-  - name: ubuntu-18.04
+  - name: ubuntu-20.04

     driver:
     driver:

-      image: dokken/ubuntu-18.04
+      image: dokken/ubuntu-20.04

       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:
       privileged: true
       pid_one_command: /bin/systemd
       intermediate_instructions:


@@ -32,18 +36,39 @@ suites:
   - name: apt
     run_list:
       - recipe[apt::default]
   - name: apt
     run_list:
       - recipe[apt::default]

+  - name: backup
+    run_list:
+      - recipe[backup::default]

   - name: bind
     run_list:
       - recipe[bind::default]
     attributes:
       bind:
         clients: none
   - name: bind
     run_list:
       - recipe[bind::default]
     attributes:
       bind:
         clients: none

+  - name: blog
+    run_list:
+      - recipe[blog::default]

   - name: blogs
     run_list:
       - recipe[blogs::default]
   - name: blogs
     run_list:
       - recipe[blogs::default]

+  - name: civicrm
+    run_list:
+      - recipe[civicrm::default]

   - name: clamav
     run_list:
       - recipe[clamav::default]
   - name: clamav
     run_list:
       - recipe[clamav::default]

+  - name: db-backup
+    run_list:
+      - recipe[db::backup]
+  - name: db-base
+    run_list:
+      - recipe[db::base]
+  - name: db-master
+    run_list:
+      - recipe[db::master]
+  - name: db-slave
+    run_list:
+      - recipe[db::slave]

   - name: devices
     run_list:
       - recipe[devices::default]
   - name: devices
     run_list:
       - recipe[devices::default]


@@ -68,15 +93,18 @@ suites:
   - name: dmca
     run_list:
       - recipe[dmca::default]
   - name: dmca
     run_list:
       - recipe[dmca::default]

-    attributes:
-      apache:
-        mpm: prefork
+  - name: dns
+    run_list:
+      - recipe[dns::default]
+  - name: docker
+    run_list:
+      - recipe[docker::default]

   - name: donate
     run_list:
       - recipe[donate::default]
   - name: donate
     run_list:
       - recipe[donate::default]

-    attributes:
-      apache:
-        mpm: prefork
+  - name: elasticsearch
+    run_list:
+      - recipe[elasticsearch::default]

   - name: exim
     run_list:
       - recipe[exim::default]
   - name: exim
     run_list:
       - recipe[exim::default]


@@ -86,26 +114,84 @@ suites:
   - name: forum
     run_list:
       - recipe[forum::default]
   - name: forum
     run_list:
       - recipe[forum::default]

+  - name: ftp
+    run_list:
+      - recipe[ftp::default]
+  - name: geodns
+    run_list:
+      - recipe[geodns::default]

     attributes:
     attributes:

-      apache:
-        mpm: prefork
+      networking:
+        interfaces:
+          test:
+            role: external
+            address: 172.18.0.2
+  - name: geoipupdate
+    run_list:
+      - recipe[geoipupdate::default]
+  - name: git
+    run_list:
+      - recipe[git::default]
+  - name: git-server
+    run_list:
+      - recipe[git::server]
+  - name: git-web
+    run_list:
+      - recipe[git::web]
+  - name: gps-tile
+    run_list:
+      - recipe[gps-tile::default]
+  - name: hardware
+    run_list:
+      - recipe[hardware::default]
+  - name: hot
+    run_list:
+      - recipe[hot::default]

   - name: incron
     run_list:
       - recipe[incron::default]
   - name: incron
     run_list:
       - recipe[incron::default]

+  - name: irc
+    run_list:
+      - recipe[irc::default]
+  - name: kibana
+    run_list:
+      - recipe[kibana::default]

   - name: letsencrypt
     run_list:
   - name: letsencrypt
     run_list:

-      - role[letsencrypt]
+      - recipe[letsencrypt::default]

     attributes:
       apt:
         sources:
           - openstreetmap
     attributes:
       apt:
         sources:
           - openstreetmap

+  - name: logstash
+    run_list:
+      - recipe[logstash::default]
+  - name: logstash-forwarder
+    run_list:
+      - recipe[logstash::forwarder]
+    attributes:
+      logstash:
+        forwarder:
+          filebeat.prospectors:
+            - input_type: log
+              paths:
+                - /var/log/apache2/access.log
+              type: apache
+  - name: mail
+    run_list:
+      - role[mail]
+  - name: mailman
+    run_list:
+      - recipe[mailman::default]

   - name: memcached
     run_list:
   - name: memcached
     run_list:

-      - recipe[munin::default]

       - recipe[memcached::default]
   - name: munin
     run_list:
       - recipe[munin::default]
       - recipe[memcached::default]
   - name: munin
     run_list:
       - recipe[munin::default]

+  - name: munin-plugins
+    run_list:
+      - recipe[munin::plugins]

   - name: munin-server
     run_list:
       - recipe[munin::server]
   - name: munin-server
     run_list:
       - recipe[munin::server]


@@ -117,15 +203,13 @@ suites:
       - recipe[networking::default]
   - name: nginx
     run_list:
       - recipe[networking::default]
   - name: nginx
     run_list:

-      - recipe[munin::default]

       - recipe[nginx::default]
       - recipe[nginx::default]

-    attributes:
-      networking:
-        nameservers:
-          - 127.0.0.1

   - name: nodejs
     run_list:
       - recipe[nodejs::default]
   - name: nodejs
     run_list:
       - recipe[nodejs::default]

+  - name: nominatim
+    run_list:
+      - recipe[nominatim::default]

   - name: ntp
     run_list:
       - recipe[ntp::default]
   - name: ntp
     run_list:
       - recipe[ntp::default]


@@ -135,12 +219,33 @@ suites:
   - name: osmosis
     run_list:
       - recipe[osmosis::default]
   - name: osmosis
     run_list:
       - recipe[osmosis::default]

+  - name: osqa
+    run_list:
+      - recipe[osqa::default]

   - name: otrs
     run_list:
       - recipe[otrs::default]
   - name: otrs
     run_list:
       - recipe[otrs::default]

+  - name: passenger
+    run_list:
+      - recipe[passenger::default]
+  - name: php
+    run_list:
+      - recipe[php::default]
+  - name: php-apache
+    run_list:
+      - recipe[php::apache]
+  - name: php-fpm
+    run_list:
+      - recipe[php::fpm]
+  - name: piwik
+    run_list:
+      - recipe[piwik::default]

   - name: planet
     run_list:
       - recipe[planet::default]
   - name: planet
     run_list:
       - recipe[planet::default]

+  - name: planet-current
+    run_list:
+      - recipe[planet::current]

   - name: planet-dump
     run_list:
       - recipe[planet::dump]
   - name: planet-dump
     run_list:
       - recipe[planet::dump]


@@ -156,15 +261,104 @@ suites:
     attributes:
       web:
         readonly_database_host: readonly
     attributes:
       web:
         readonly_database_host: readonly

+  - name: postgresql
+    run_list:
+      - recipe[postgresql::default]
+    attributes:
+      postgresql:
+        versions:
+          - 10
+  - name: prometheus
+    run_list:
+      - recipe[prometheus::default]
+    attributes:
+      networking:
+        interfaces:
+          test:
+            interface: eth0
+            role: internal
+            address: 172.18.0.2
+            prefix: 16
+            gateway: 172.18.0.1
+  - name: prometheus-server
+    run_list:
+      - recipe[prometheus::server]
+    attributes:
+      prometheus:
+        promscale: true

   - name: python
     run_list:
       - recipe[python::default]
   - name: python
     run_list:
       - recipe[python::default]

+  - name: rsyncd
+    run_list:
+      - recipe[rsyncd::default]
+  - name: serverinfo
+    run_list:
+      - recipe[serverinfo::default]
+  - name: snmpd
+    run_list:
+      - recipe[snmpd::default]

   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]
   - name: spamassassin
     run_list:
       - recipe[spamassassin::default]

-  - name: squid
+  - name: ssl
+    run_list:
+      - recipe[ssl::default]
+  - name: stateofthemap
+    run_list:
+      - recipe[stateofthemap::default]
+  - name: subversion
+    run_list:
+      - recipe[subversion::default]
+  - name: supybot
+    run_list:
+      - recipe[supybot::default]
+  - name: switch2osm
+    run_list:
+      - recipe[switch2osm::default]
+  - name: sysctl
+    run_list:
+      - recipe[sysctl::default]
+  - name: sysfs
+    run_list:
+      - recipe[sysfs::default]
+  - name: taginfo
+    run_list:
+      - recipe[taginfo::default]
+    attributes:
+      taginfo:
+        sites:
+          - name: taginfo.example.com
+  - name: tile

     run_list:
     run_list:

-      - recipe[squid::default]
+      - recipe[tile::default]
+  - name: tilelog
+    run_list:
+      - recipe[tilelog::default]
+  - name: timescaledb
+    run_list:
+      - recipe[timescaledb::default]

   - name: tools
     run_list:
       - recipe[tools::default]
   - name: tools
     run_list:
       - recipe[tools::default]

+  - name: trac
+    run_list:
+      - recipe[trac::default]
+  - name: web-backend
+    run_list:
+      - recipe[web::backend]
+  - name: web-cgimap
+    run_list:
+      - recipe[web::cgimap]
+  - name: web-frontend
+    run_list:
+      - recipe[web::frontend]
+  - name: web-rails
+    run_list:
+      - recipe[web::rails]
+  - name: wiki
+    run_list:
+      - recipe[wiki::default]
+  - name: wordpress
+    run_list:
+      - recipe[wordpress::default]