Adding fetch_dna_files resource for HeadNode invocation of sharing and cleaning up dna.json and extra.json during an update

* Renaming the files and folders to cfn_hup_configuration

* Deleting old recipie config_cfn_hup_spec.rb

Author: Himani Anil Deshpande

cookbooks/aws-parallelcluster-environment/files/cfn_hup/get_compute_user_data.py renamed to cookbooks/aws-parallelcluster-environment/files/cfn_hup_configuration/get_compute_user_data.py

@@ -39,7 +39,7 @@
   end
 
   template '/etc/cfn/cfn-hup.conf' do
-    source 'cfn_hup/cfn-hup.conf.erb'
+    source 'cfn_hup_configuration/cfn-hup.conf.erb'
     owner 'root'
     group 'root'
     mode '0400'
@@ -54,7 +54,7 @@
   action_extra_configuration
 
   template '/etc/cfn/hooks.d/pcluster-update.conf' do
-    source "cfn_hup/cfn-hook-update.conf.erb"
+    source "cfn_hup_configuration/cfn-hook-update.conf.erb"
     owner 'root'
     group 'root'
     mode '0400'
@@ -73,7 +73,7 @@
   case node['cluster']['node_type']
   when 'HeadNode'
     cookbook_file "#{node['cluster']['scripts_dir']}/get_compute_user_data.py" do
-      source 'cfn_hup/get_compute_user_data.py'
+      source 'cfn_hup_configuration/get_compute_user_data.py'
       owner 'root'
       group 'root'
       mode '0755'
@@ -84,7 +84,7 @@
 
   when 'ComputeFleet'
     template "#{node['cluster']['scripts_dir']}/cfn-hup-update-action.sh" do
-      source "cfn_hup/#{node['cluster']['node_type']}/cfn-hup-update-action.sh.erb"
+      source "cfn_hup_configuration/#{node['cluster']['node_type']}/cfn-hup-update-action.sh.erb"
       owner 'root'
       group 'root'
       mode '0744' # TODO: Change permission

cookbooks/aws-parallelcluster-environment/resources/cfn_hup_configuration.rb

@@ -56,7 +56,7 @@ def self.configure(chef_run)
 
           it "creates the file /etc/cfn/cfn-hup.conf" do
             is_expected.to create_template("/etc/cfn/cfn-hup.conf")
-                             .with(source: 'cfn_hup/cfn-hup.conf.erb')
+                             .with(source: 'cfn_hup_configuration/cfn-hup.conf.erb')
                              .with(user: "root")
                              .with(group: "root")
                              .with(mode: "0400")
@@ -70,7 +70,7 @@ def self.configure(chef_run)
 
           it "creates the file /etc/cfn/hooks.d/pcluster-update.conf" do
             is_expected.to create_template("/etc/cfn/hooks.d/pcluster-update.conf")
-                             .with(source: 'cfn_hup/cfn-hook-update.conf.erb')
+                             .with(source: 'cfn_hup_configuration/cfn-hook-update.conf.erb')
                              .with(user: "root")
                              .with(group: "root")
                              .with(mode: "0400")
@@ -87,7 +87,7 @@ def self.configure(chef_run)
           if %(ComputeFleet).include?(node_type)
             it "creates the file #{SCRIPT_DIR}/cfn-hup-update-action.sh" do
               is_expected.to create_template("#{SCRIPT_DIR}/cfn-hup-update-action.sh")
-                               .with(source: "cfn_hup/#{node_type}/cfn-hup-update-action.sh.erb")
+                               .with(source: "cfn_hup_configuration/#{node_type}/cfn-hup-update-action.sh.erb")
                                .with(user: "root")
                                .with(group: "root")
                                .with(mode: "0744")
@@ -99,7 +99,7 @@ def self.configure(chef_run)
           elsif node_type == 'HeadNode'
             it "creates #{SCRIPT_DIR}/get_compute_user_data.py" do
               is_expected.to create_if_missing_cookbook_file("#{SCRIPT_DIR}/get_compute_user_data.py")
-                               .with(source: 'cfn_hup/get_compute_user_data.py')
+                               .with(source: 'cfn_hup_configuration/get_compute_user_data.py')
                                .with(user: 'root')
                                .with(group: 'root')
                                .with(mode: '0755')

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

@@ -15,6 +15,7 @@
 # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
 # limitations under the License.
 
+fetch_dna_files "Fetch ComputeFleet's Dna files"
 fetch_config 'Fetch and load cluster configs' do
   update true
 end

cookbooks/aws-parallelcluster-environment/spec/unit/resources/config_cfn_hup_spec.rb renamed to cookbooks/aws-parallelcluster-environment/spec/unit/resources/cfn_hup_configuration_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+resource_name :fetch_dna_files
+provides :fetch_dna_files
+unified_mode true
+
+default_action :share
+
+action :share do
+  return if on_docker?
+  return unless node['cluster']['node_type'] == 'HeadNode'
+
+  Chef::Log.info("Share extra.json with ComputeFleet")
+  ::FileUtils.cp_r('/tmp/extra.json', "#{node['cluster']['shared_dir']}/dna/extra.json",remove_destination: true)
+
+  execute "Share dna.json with ComputeFleet" do
+    command "#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/get_compute_user_data.py" \
+              " --region #{node['cluster']['region']}"
+    timeout 30
+    retries 10
+    retry_delay 90
+  end
+
+end
+
+action :cleanup do
+  return if on_docker?
+  return unless node['cluster']['node_type'] == 'HeadNode'
+
+  execute "Cleanup dna.json and extra.json from #{node['cluster']['shared_dir']}/dna" do
+    command "#{cookbook_virtualenv_path}/bin/python #{node['cluster']['scripts_dir']}/get_compute_user_data.py" \
+              " --region #{node['cluster']['region']} --cleanup"
+    timeout 30
+    retries 10
+    retry_delay 90
+  end
+end