[AD] Execute the directory service config recipe during the update only on the head node.

Signed-off-by: Giacomo Marciani <[email protected]>

Author: gmarciani

cookbooks/aws-parallelcluster-entrypoints/recipes/update.rb

@@ -15,10 +15,8 @@
 # Fetch and load cluster configs
 include_recipe 'aws-parallelcluster-platform::update'
 
-# generate the updated shared storages mapping file
-include_recipe 'aws-parallelcluster-environment::update_fs_mapping'
+include_recipe 'aws-parallelcluster-environment::update'
 
-include_recipe 'aws-parallelcluster-environment::directory_service'
 include_recipe 'aws-parallelcluster-slurm::update' if node['cluster']['scheduler'] == 'slurm'
 
 # Update node package - useful for development purposes only

cookbooks/aws-parallelcluster-entrypoints/spec/unit/recipes/update_spec.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright:: 2024 Amazon.com, Inc. and its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
+# License. A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe 'aws-parallelcluster-entrypoints::update' do
+  before do
+    @included_recipes = []
+    %w(
+      aws-parallelcluster-platform::update
+      aws-parallelcluster-environment::update
+      aws-parallelcluster-slurm::update
+      aws-parallelcluster-computefleet::update_parallelcluster_node
+    ).each do |recipe_name|
+      allow_any_instance_of(Chef::Recipe).to receive(:include_recipe).with(recipe_name) do
+        @included_recipes << recipe_name
+      end
+    end
+  end
+
+  for_all_oses do |platform, version|
+    context "on #{platform}#{version}" do
+      for_all_node_types do |node_type|
+        context "when #{node_type}" do
+          [true, false].each do |is_custom_node|
+            context "and does #{'not ' unless is_custom_node}use a custom node package" do
+              cached(:chef_run) do
+                runner = runner(platform: platform, version: version) do |node|
+                  allow_any_instance_of(Object).to receive(:fetch_config).and_return(OpenStruct.new)
+
+                  node.override['cluster']['node_type'] = node_type
+                  node.override['cluster']['scheduler'] = 'slurm'
+                  node.override['cluster']['custom_node_package'] = "CUSTOM_NODE_PACKAGE" if is_custom_node
+                end
+                runner.converge(described_recipe)
+              end
+              cached(:node) { chef_run.node }
+
+              expected_recipes = %w(
+                                  aws-parallelcluster-platform::update
+                                  aws-parallelcluster-environment::update
+                                  aws-parallelcluster-slurm::update
+                                )
+
+              if is_custom_node
+                expected_recipes = expected_recipes.append("aws-parallelcluster-computefleet::update_parallelcluster_node")
+              end
+
+              it "includes the recipes in the right order" do
+                chef_run
+                expect(@included_recipes).to eq(expected_recipes)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

cookbooks/aws-parallelcluster-environment/recipes/update.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Copyright:: 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
+# License. A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+
+# generate the updated shared storages mapping file
+include_recipe "aws-parallelcluster-environment::update_fs_mapping"
+
+include_recipe "aws-parallelcluster-environment::directory_service" if node["cluster"]["node_type"] == "HeadNode"

cookbooks/aws-parallelcluster-environment/spec/unit/recipes/update_spec.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# Copyright:: 2024 Amazon.com, Inc. and its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
+# License. A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe 'aws-parallelcluster-environment::update' do
+  before do
+    @included_recipes = []
+    %w(
+      aws-parallelcluster-environment::update_fs_mapping
+      aws-parallelcluster-environment::directory_service
+    ).each do |recipe_name|
+      allow_any_instance_of(Chef::Recipe).to receive(:include_recipe).with(recipe_name) do
+        @included_recipes << recipe_name
+      end
+    end
+  end
+
+  for_all_oses do |platform, version|
+    context "on #{platform}#{version}" do
+      for_all_node_types do |node_type|
+        context "when #{node_type}" do
+          cached(:chef_run) do
+            runner = runner(platform: platform, version: version) do |node|
+              node.override['cluster']['node_type'] = node_type
+            end
+            runner.converge(described_recipe)
+          end
+          cached(:node) { chef_run.node }
+
+          expected_recipes = %w(aws-parallelcluster-environment::update_fs_mapping)
+
+          if node_type == "HeadNode"
+            expected_recipes = expected_recipes.append("aws-parallelcluster-environment::directory_service")
+          end
+
+          it "includes the recipes in the right order" do
+            chef_run
+            expect(@included_recipes).to eq(expected_recipes)
+          end
+        end
+      end
+    end
+  end
+end