Merge 1.4.1 release into master

Author: rajachan

CHANGELOG.md

@@ -3,6 +3,13 @@ cfncluster-cookbook CHANGELOG
 
 This file is used to list changes made in each version of the cfncluster cookbook.
 
+1.4.1
+-----
+
+Major new features/updates:
+
+  - Updated to latest cfncluster-node 1.4.3
+
 1.4.0
 -----
 

attributes/default.rb

@@ -19,7 +19,7 @@
 default['cfncluster']['scripts_dir'] = "#{node['cfncluster']['base_dir']}/scripts"
 default['cfncluster']['license_dir'] = "#{node['cfncluster']['base_dir']}/licenses"
 # Python packages
-default['cfncluster']['cfncluster-node-version'] = '1.4.2'
+default['cfncluster']['cfncluster-node-version'] = '1.4.3'
 default['cfncluster']['cfncluster-supervisor-version'] = '3.3.1'
 # URLs to software packages used during install receipes
 # Gridengine software

centos-upgrade-first-stage.sh

@@ -80,8 +80,12 @@ sudo /bin/sed -r -i -e 's/SELINUX=enforcing/SELINUX=permissive/' /etc/selinux/co
 # install) and turning off ifnames, because a bunch of the scripts expect
 # to find eth0.  Should handle the eth naming better, but that's todo.
 echo "Updating Grub command line"
-sudo /bin/sed -r -i -e 's/GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 net.ifnames=0 rd.driver.blacklist=nouveau nouveau.modeset=0"/' /etc/default/grub
-sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+if test $is_centos6 -eq 1; then
+    sudo grubby --update-kernel=ALL --args="net.ifnames=0 rd.driver.blacklist=nouveau nouveau.modeset=0"
+else
+    sudo /bin/sed -r -i -e 's/GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 net.ifnames=0 rd.driver.blacklist=nouveau nouveau.modeset=0"/' /etc/default/grub
+    sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+fi
 
 echo "Update Complete.  Rebooting."
 # sleep for 30 seconds to make sure packer doesn't try to run the next

centos-upgrade-second-stage.sh

@@ -40,6 +40,11 @@ fi
 echo "Cleaning out old kernels"
 sudo package-cleanup -y --oldkernels --count=1
 
+if test $is_centos6 -eq 1; then
+    sudo yum install -y cloud-init cloud-utils dracut-modules-growroot cloud-utils-growpart
+    rpm -qa kernel-lt | sed 's/^kernel-lt-//'  | xargs -I {} sudo dracut -f /boot/initramfs-{}.img {}
+fi
+
 echo "Cleaning up filesystem"
 sudo rm -rf /tmp/* /var/tmp/* /var/log/* /etc/ssh/ssh_host*
 sudo rm -rf /root/* /root/.ssh /root/.history /root/.bash_history

metadata.rb

@@ -6,7 +6,7 @@
 long_description 'Installs/Configures cfncluster'
 issues_url 'https://github.com/awslabs/cfncluster-cookbook/issues'
 source_url 'https://github.com/awslabs/cfncluster-cookbook'
-version '1.4.0'
+version '1.4.1'
 
 depends 'build-essential', '~> 8.0.2'
 depends 'poise-python', '~> 1.6.0'

packer_alinux.json

@@ -103,6 +103,25 @@
     },
     {
       "type" : "chef-solo",
+      "remote_cookbook_paths" : [
+        "/etc/chef/cookbooks"
+      ],
+      "skip_install" : "true",
+      "execute_command" : "sudo chef-client -z --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
+      "run_list" : [
+        "cfncluster::_update_packages"
+      ]
+    },
+    {
+      "type" : "shell",
+      "expect_disconnect" : "true",
+      "inline" : [
+        "sudo reboot"
+      ]
+    },
+    {
+      "type" : "chef-solo",
+      "pause_before": "2m",
       "json" : {
         "cfncluster" : {
           "nvidia" : {

packer_centos6.json

@@ -17,7 +17,7 @@
     {
       "type" : "amazon-ebs",
       "region" : "us-east-1",
-      "source_ami" : "ami-9ff841e5",
+      "source_ami" : "ami-44f1aa3e",
       "ami_regions" : "{{user `build_for`}}",
       "ami_groups" : "{{user `ami_perms`}}",
       "instance_type" : "{{user `instance_type`}}",

packer_centos7.json

@@ -17,7 +17,7 @@
     {
       "type" : "amazon-ebs",
       "region" : "us-east-1",
-      "source_ami" : "ami-01098c7b",
+      "source_ami" : "ami-06fea57c",
       "ami_regions" : "{{user `build_for`}}",
       "ami_groups" : "{{user `ami_perms`}}",
       "instance_type" : "{{user `instance_type`}}",
@@ -103,6 +103,25 @@
     },
     {
       "type" : "chef-solo",
+      "remote_cookbook_paths" : [
+        "/etc/chef/cookbooks"
+      ],
+      "skip_install" : "true",
+      "execute_command" : "sudo chef-client -z --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
+      "run_list" : [
+        "cfncluster::_update_packages"
+      ]
+    },
+    {
+      "type" : "shell",
+      "expect_disconnect" : "true",
+      "inline" : [
+        "sudo reboot"
+      ]
+    },
+    {
+      "type" : "chef-solo",
+      "pause_before": "2m",
       "json" : {
         "cfncluster" : {
           "nvidia" : {

packer_ubuntu1404.json

@@ -111,6 +111,25 @@
     },
     {
       "type" : "chef-solo",
+      "remote_cookbook_paths" : [
+        "/etc/chef/cookbooks"
+      ],
+      "skip_install" : "true",
+      "execute_command" : "sudo chef-client -z --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
+      "run_list" : [
+        "cfncluster::_update_packages"
+      ]
+    },
+    {
+      "type" : "shell",
+      "expect_disconnect" : "true",
+      "inline" : [
+        "sudo reboot"
+      ]
+    },
+    {
+      "type" : "chef-solo",
+      "pause_before": "2m",
       "json" : {
         "cfncluster" : {
           "nvidia" : {

packer_ubuntu1604.json

@@ -111,6 +111,25 @@
     },
     {
       "type" : "chef-solo",
+      "remote_cookbook_paths" : [
+        "/etc/chef/cookbooks"
+      ],
+      "skip_install" : "true",
+      "execute_command" : "sudo chef-client -z --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
+      "run_list" : [
+        "cfncluster::_update_packages"
+      ]
+    },
+    {
+      "type" : "shell",
+      "expect_disconnect" : "true",
+      "inline" : [
+        "sudo reboot"
+      ]
+    },
+    {
+      "type" : "chef-solo",
+      "pause_before": "2m",
       "json" : {
         "cfncluster" : {
           "nvidia" : {