Remove remaining uses of "normal" attributes

[chef.git] / cookbooks / dev / recipes / default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index 1888e9cdde5f12035b5a005242e525cfd9b82ece..e33c3b230e4d68d728aca6de963f6a92d993fdbd 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -258,9 +258,9 @@ if node[:postgresql][:clusters][:"12/main"]
 
     if details[:repository]
       site_aliases = details[:aliases] || []
-      secret_key_base = details[:secret_key_base] || SecureRandom.base64(96)
+      secret_key_base = persistent_token("dev", "rails", name, "secret_key_base")
 
-      node.normal[:dev][:rails][name][:secret_key_base] = secret_key_base
+      node.rm_normal(:dev, :rails, name)
 
       postgresql_database database_name do
         cluster "12/main"
@@ -447,8 +447,6 @@ if node[:postgresql][:clusters][:"12/main"]
         action :drop
         cluster "12/main"
       end
-
-      node.normal[:dev][:rails].delete(name)
     end
   end