add infra-server org and user config to automate recipe (#6)

* add infra-server org and user config to automate recipe

.github/workflows/ci.yml

@@ -4,41 +4,37 @@ on:
 
 jobs:
   markdownlint:
-    uses: Stromweld/github-workflows/.github/workflows/markdownlint.yml@main
+    uses: Stromweld/github-workflows/.github/workflows/markdown-lint.yml@main
 
   yamllint:
-    uses: Stromweld/github-workflows/.github/workflows/yamllint.yml@main
+    uses: Stromweld/github-workflows/.github/workflows/yaml-lint.yml@main
 
   jsonlint:
-    uses: Stromweld/github-workflows/.github/workflows/jsonlint.yml@main
+    uses: Stromweld/github-workflows/.github/workflows/json-lint.yml@main
 
   cookstylelint:
-    uses: Stromweld/github-workflows/.github/workflows/cookstylelint.yml@main
+    uses: Stromweld/github-workflows/.github/workflows/cookstyle-lint.yml@main
 
   integration-dokken:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         os:
           - amazonlinux-2
-#          - amazonlinux-2022
+          - amazonlinux-2023
           - centos-7
-          - centos-8
+          - centos-stream-8
+          - centos-stream-9
           - almalinux-8
-#          - almalinux-9 # TODO: uncomment this when almalinux-9 dokken image is fixed
+          - almalinux-9
+          - rockylinux-8
+          - rockylinux-9
           - ubuntu-2004
           - ubuntu-2204
         suite:
           - default
           - automate
           - supermarket
-        exclude:
-          - os: centos-7
-            suite: default
-          - os: ubuntu-2204
-            suite: default
-          - os: ubuntu-2204
-            suite: supermarket
       fail-fast: false
     steps:
       - name: Check out code
@@ -54,7 +50,6 @@ jobs:
         env:
           CHEF_LICENSE: accept-no-persist
           KITCHEN_LOCAL_YAML: kitchen.dokken.yml
-        continue-on-error: false
       - name: Test-Kitchen Verify
         uses: actionshub/test-kitchen@main
         with:

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This file is used to list changes made in each version of the chef_software cookbook.
 
+## 2.1.0 (20232-03-17)
+
+- [Corey Hemminger] - Add Integrated Infra-Server user and org config to automate recipe
+
 ## 2.0.2 (2022-09-29)
 
 - [Corey Hemminger] - Removed chef-ingredient reference to fork from policyfile

kitchen.dokken.yml

@@ -29,14 +29,34 @@ platforms:
       image: dokken/amazonlinux-2
       pid_one_command: /usr/lib/systemd/systemd
 
+  - name: amazonlinux-2023
+    driver:
+      image: dokken/amazonlinux-2023
+      pid_one_command: /usr/lib/systemd/systemd
+
   - name: centos-7
     driver:
       image: dokken/centos-7
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: centos-8
+  - name: centos-stream-8
     driver:
-      image: dokken/centos-8
+      image: dokken/centos-stream-8
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: centos-stream-9
+    driver:
+      image: dokken/centos-stream-9
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: rockylinux-8
+    driver:
+      image: dokken/rockylinux-8
+      pid_one_command: /usr/lib/systemd/systemd
+
+  - name: rockylinux-9
+    driver:
+      image: dokken/rockylinux-9
       pid_one_command: /usr/lib/systemd/systemd
 
   - name: debian-10
@@ -48,7 +68,7 @@ platforms:
 
   - name: debian-11
     driver:
-      image: dokken/debian-10
+      image: dokken/debian-11
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update

kitchen.yml

@@ -20,9 +20,12 @@ platforms:
   - name: almalinux-8
   - name: almalinux-9
   - name: amazonlinux-2
-  # - name: amazonlinux-2022
+  - name: rockylinux-8
+  - name: rockylinux-9
+  # - name: amazonlinux-2023
   - name: centos-7
-  - name: centos-8
+  - name: centos-stream-8
+  - name: centos-stream-9
   - name: debian-10
   - name: debian-11
   - name: ubuntu-20.04
@@ -43,7 +46,7 @@ suites:
     named_run_list: 'chef_automatev2'
     driver:
       customize:
-        memory: 2193
+        memory: 3072
     verifier:
       inspec_tests:
         - test/integration/default

metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license 'Apache-2.0'
 description 'Installs/Configures chef server, chef automate2, chef supermarket'
-version '2.0.2'
+version '2.1.0'
 chef_version '>= 16.4'
 
 issues_url 'https://github.com/Stromweld/chef_software/issues'

recipes/chef_automatev2.rb

@@ -31,3 +31,21 @@
     create_iam_policy(hash['policy_json'])
   end
 end
+
+if node['chef_software']['chef_automatev2']['products'].include?('infra-server')
+  node['chef_software']['chef_user']&.each do |name, hash|
+    chef_user name do
+      hash&.each do |key, value|
+        send(key, value)
+      end
+    end
+  end
+
+  node['chef_software']['chef_org']&.each do |name, hash|
+    chef_org name do
+      hash&.each do |key, value|
+        send(key, value)
+      end
+    end
+  end
+end