Merge interface families

[chef.git] / .kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 34a4ccb040b5d7e539029f22b1f7aeb6b1bcd89c..ca4895b68b5d0f59c10ace98f5a364436ddd5e8c 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -28,8 +28,6 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-        # Pre-cache common required system packages
-        - RUN /usr/bin/apt-get install --download-only -y apache2 libwww-perl munin-node shorewall unattended-upgrades wireguard-tools zsh
   - name: ubuntu-22.04
     driver:
       image: dokken/ubuntu-22.04
@@ -37,8 +35,6 @@ platforms:
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update -y
-        # Pre-cache common required system packages
-        - RUN /usr/bin/apt-get install --download-only -y apache2 libwww-perl munin-node shorewall unattended-upgrades wireguard-tools zsh
 
 suites:
   - name: accounts
@@ -101,9 +97,10 @@ suites:
           test:
             interface: eth0
             role: internal
-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1
         roles:
           external:
             zone: test
@@ -128,9 +125,24 @@ suites:
   - name: fail2ban
     run_list:
       - recipe[fail2ban::default]
-  - name: forum
+  - name: foundation-board
     run_list:
-      - recipe[forum::default]
+      - recipe[foundation::board]
+  - name: foundation-dwg
+    run_list:
+      - recipe[foundation::dwg]
+  - name: foundation-mwg
+    run_list:
+      - recipe[foundation::mwg]
+  - name: foundation-owg
+    run_list:
+      - recipe[foundation::owg]
+  - name: foundation-welcome
+    run_list:
+      - recipe[foundation::welcome]
+  - name: foundation-wiki
+    run_list:
+      - recipe[foundation::wiki]
   - name: ftp
     run_list:
       - recipe[ftp::default]
@@ -142,7 +154,9 @@ suites:
         interfaces:
           test:
             role: external
-            address: 172.18.0.2
+            inet:
+              address: 172.18.0.2
+              prefix: 16
   - name: geoipupdate
     run_list:
       - recipe[geoipupdate::default]
@@ -286,7 +300,7 @@ suites:
     attributes:
       postgresql:
         versions:
-          - 10
+          - 15
   - name: prometheus
     run_list:
       - recipe[prometheus::default]
@@ -296,9 +310,10 @@ suites:
           test:
             interface: eth0
             role: internal
-            address: 172.18.0.2
-            prefix: 16
-            gateway: 172.18.0.1
+            inet:
+              address: 172.18.0.2
+              prefix: 16
+              gateway: 172.18.0.1
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
@@ -323,15 +338,9 @@ suites:
   - name: ssl
     run_list:
       - recipe[ssl::default]
-  - name: stateofthemap
-    run_list:
-      - recipe[stateofthemap::default]
-  - name: stateofthemap-static
-    run_list:
-      - recipe[stateofthemap::static]
-  - name: stateofthemap-jekyll
+  - name: stateofthemap-container
     run_list:
-      - recipe[stateofthemap::jekyll]
+      - recipe[stateofthemap::container]
   - name: stateofthemap-wordpress
     run_list:
       - recipe[stateofthemap::wordpress]