From 804ce47c0c939c9cfc99b0e9822555a8febfd00b Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Sat, 9 Dec 2017 08:58:22 -0500
Subject: [PATCH] Allow disabling nodesetwarning... again

---
 xCAT-server/lib/xcat/plugins/destiny.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm
index 48b8411a2..b5aff6fae 100755
--- a/xCAT-server/lib/xcat/plugins/destiny.pm
+++ b/xCAT-server/lib/xcat/plugins/destiny.pm
@@ -261,8 +261,19 @@ sub setdestiny {
         my $curnetboot = $nbents->{netboot};
 
         if ($state ne 'osimage') {
-            $callback->({ error => "The options \"install\", \"netboot\", and \"statelite\" have been deprecated, use \"osimage=<osimage_name>\" instead.", errorcode => [1], errorabort => [1] });
-            return;        
+            my @ents = xCAT::TableUtils->get_site_attribute("disablenodesetwarning");
+            my $site_ent = $ents[0];
+            if (!defined($site_ent) || ($site_ent =~ /no/i) || ($site_ent =~ /0/))
+            {
+                if (!defined($::DISABLENODESETWARNING)) {    # set by AAsn.pm
+                    $callback->(
+                        {
+                            error => ["The options \"install\", \"netboot\", and \"statelite\" have been deprecated, use \"nodeset <noderange> osimage=<osimage_name>\" instead."], errorcode => [1]
+                        }
+                    );
+                    return;
+                }
+            }
 
             my $updateattribs;
             if ($target) {