hacky way of adding idempotency for org admin association (#8)

* hacky way of adding idempotency for org admin association
Stromweld · Mar 31, 2023 · c94b0d1 · c94b0d1
1 parent 7c0a2ae
commit c94b0d1
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,6 @@ jobs:
     strategy:
       matrix:
         os:
-          - amazonlinux-2
           - amazonlinux-2023
           - centos-7
           - centos-stream-8

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 This file is used to list changes made in each version of the chef_software cookbook.
 
-## 2.1.1 (20232-03-20)
+## 2.1.2 (2023-03-31)
+
+- [Corey Hemminger] - Hacky way of adding idempotency to chef-server org admin association
+
+## 2.1.1 (2023-03-20)
 
 - [Corey Hemminger] - Add safe navigation to .include method for automatev2 recipe
 

diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml
@@ -24,11 +24,6 @@ platforms:
       image: dokken/almalinux-9
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: amazonlinux-2
-    driver:
-      image: dokken/amazonlinux-2
-      pid_one_command: /usr/lib/systemd/systemd
-
   - name: amazonlinux-2023
     driver:
       image: dokken/amazonlinux-2023

diff --git a/metadata.rb b/metadata.rb
@@ -3,7 +3,7 @@
 maintainer_email 'hemminger@hotmail.com'
 license 'Apache-2.0'
 description 'Installs/Configures chef server, chef automate2, chef supermarket'
-version '2.1.1'
+version '2.1.2'
 chef_version '>= 16.4'
 
 issues_url 'https://github.com/Stromweld/chef_software/issues'

diff --git a/recipes/chef_automatev2.rb b/recipes/chef_automatev2.rb
@@ -42,10 +42,17 @@
   end
 
   node['chef_software']['chef_org']&.each do |name, hash|
+    template "#{Chef::Config[:file_cache_path]}/#{name}" do
+      source 'orgs.erb'
+      variables org_opts: hash
+      notifies :create, "chef_org[#{name}]", :immediately
+    end
+
     chef_org name do
       hash&.each do |key, value|
         send(key, value)
       end
+      action :nothing
     end
   end
 end