From acb5ea419113188317bc7bede334b90e12efd5ce Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 23 Sep 2023 12:52:44 +0100 Subject: [PATCH] Make sure the planet user is created by recipes which use it --- cookbooks/planet/recipes/dump.rb | 1 + cookbooks/planet/recipes/notes.rb | 1 + cookbooks/tilelog/attributes/default.rb | 2 ++ cookbooks/tilelog/metadata.rb | 1 + cookbooks/tilelog/recipes/default.rb | 1 + 5 files changed, 6 insertions(+) diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb index 854c0a7c6..6cc509c62 100644 --- a/cookbooks/planet/recipes/dump.rb +++ b/cookbooks/planet/recipes/dump.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "git" package %w[ diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb index d8d1647f9..57682bead 100644 --- a/cookbooks/planet/recipes/notes.rb +++ b/cookbooks/planet/recipes/notes.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "awscli" include_recipe "git" diff --git a/cookbooks/tilelog/attributes/default.rb b/cookbooks/tilelog/attributes/default.rb index 9af062fb5..349016329 100644 --- a/cookbooks/tilelog/attributes/default.rb +++ b/cookbooks/tilelog/attributes/default.rb @@ -1 +1,3 @@ +default[:accounts][:users][:planet][:status] = :role + default[:tilelog][:output_directory] = "/store/planet/tile_logs" diff --git a/cookbooks/tilelog/metadata.rb b/cookbooks/tilelog/metadata.rb index d5dd55bcf..0dba182a6 100644 --- a/cookbooks/tilelog/metadata.rb +++ b/cookbooks/tilelog/metadata.rb @@ -6,5 +6,6 @@ version "1.0.0" supports "ubuntu" +depends "accounts" depends "python" depends "systemd" diff --git a/cookbooks/tilelog/recipes/default.rb b/cookbooks/tilelog/recipes/default.rb index 823e1a3f6..2722c4f32 100644 --- a/cookbooks/tilelog/recipes/default.rb +++ b/cookbooks/tilelog/recipes/default.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "python" passwords = data_bag_item("tilelog", "passwords")