Switch to multi_user.target runlevel only for official ami build (#845)

* Switch to user_multi.target runlevel only for official ami build

Signed-off-by: Yulei Wang <[email protected]>

Co-authored-by: Luca Carrogu <[email protected]>

Author: 2 people

CHANGELOG.md

@@ -9,7 +9,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 **ENHANCEMENTS**
 - Configure NFS threads to be max(8, num_cores) for performance. This enhancement will not take effect on Ubuntu 16.04 unless the instance is rebooted.
 - EFA kernel module now installed also on ARM instances with `alinux2` and `ubuntu1804`
-- Set default systemd runlevel to multi-user.target on all OSes during ami creation. The runlevel is set to graphical.target only when DCV is enabled.
+- Set default systemd runlevel to multi-user.target on all OSes during ParallelCluster official ami creation. The runlevel is set to graphical.target on head node only when DCV is enabled.
 
 **CHANGES**
 - Upgrade EFA installer to version 1.11.0

amis/packer_alinux.json

@@ -226,6 +226,7 @@
           "nvidia" : {
             "enabled" : "{{user `nvidia_enabled`}}"
           },
+          "is_official_ami_build": "true",
           "custom_node_package" : "{{user `custom_node_package`}}",
           "cfn_base_os" : "alinux"
         }

amis/packer_alinux2.json

@@ -226,6 +226,7 @@
           "nvidia" : {
             "enabled" : "{{user `nvidia_enabled`}}"
           },
+          "is_official_ami_build": "true",
           "custom_node_package" : "{{user `custom_node_package`}}",
           "cfn_base_os" : "alinux2"
         }

amis/packer_centos7.json

@@ -245,6 +245,7 @@
           "dcv": {
             "installed" : "{{user `dcv_installed`}}"
           },
+          "is_official_ami_build": "true",
           "custom_node_package" : "{{user `custom_node_package`}}",
           "cfn_base_os" : "centos7"
         }

amis/packer_centos8.json

@@ -241,6 +241,7 @@
           "nvidia" : {
             "enabled" : "{{user `nvidia_enabled`}}"
           },
+          "is_official_ami_build": "true",
           "dcv": {
             "installed" : "{{user `dcv_installed`}}"
           },

amis/packer_ubuntu1604.json

@@ -247,6 +247,7 @@
           "nvidia" : {
             "enabled" : "{{user `nvidia_enabled`}}"
           },
+          "is_official_ami_build": "true",
           "custom_node_package" : "{{user `custom_node_package`}}",
           "cfn_base_os" : "ubuntu1604"
         }

amis/packer_ubuntu1804.json

@@ -251,6 +251,7 @@
           "dcv": {
             "installed" : "{{user `dcv_installed`}}"
           },
+          "is_official_ami_build": "true",
           "custom_node_package" : "{{user `custom_node_package`}}",
           "cfn_base_os" : "ubuntu1804"
         }

attributes/default.rb

@@ -437,3 +437,6 @@
 
 # AWS domain
 default['cfncluster']['aws_domain'] = aws_domain
+
+# Official ami build
+default['cfncluster']['is_official_ami_build'] = false

recipes/dcv_install.rb

@@ -229,9 +229,11 @@ def disable_lock_screen
   end
 end
 
-# Switch runlevel to multi-user.target
-if node['init_package'] == 'systemd'
-  execute "set default systemd runlevel to multi-user.target" do
-    command "systemctl set-default multi-user.target"
+# Switch runlevel to multi-user.target for official ami
+if node['cfncluster']['is_official_ami_build']
+  if node['init_package'] == 'systemd'
+    execute "set default systemd runlevel to multi-user.target" do
+      command "systemctl set-default multi-user.target"
+    end
   end
 end

recipes/tests.rb

@@ -259,7 +259,7 @@
       command "systemctl show -p SubState gdm | grep -i running"
     end
   end
-elsif node['init_package'] == 'systemd'
+elsif node['init_package'] == 'systemd' && node['conditions']['ami_bootstrapped']
   execute 'check systemd default runlevel' do
     command "systemctl get-default | grep -i multi-user.target"
   end