You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by ar...@apache.org on 2017/07/12 23:06:01 UTC

svn commit: r1801787 - in /vcl/trunk/managementnode/lib/VCL: DataStructure.pm Module/OS/Windows.pm Module/OS/Windows/Version_6.pm

Author: arkurth
Date: Wed Jul 12 23:06:01 2017
New Revision: 1801787

URL: http://svn.apache.org/viewvc?rev=1801787&view=rev
Log:
VCL-887
Removed warning message if the management node identity key isn't set in DataStructure.pm::get_management_node_identity_key_paths and configured it to return /etc/vcl/vcl.key.

Changed WARNING messages to OK to In Windows.pm::get_product_key, Windows.pm::get_kms_servers, and Version_6.pm::activate_kms prevent multiple warnings in vcld.log if KMS/MAK info hasn't been configured.

Modified:
    vcl/trunk/managementnode/lib/VCL/DataStructure.pm
    vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
    vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm

Modified: vcl/trunk/managementnode/lib/VCL/DataStructure.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/DataStructure.pm?rev=1801787&r1=1801786&r2=1801787&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/DataStructure.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/DataStructure.pm Wed Jul 12 23:06:01 2017
@@ -2001,8 +2001,7 @@ sub get_management_node_identity_key_pat
 	
 	my $keys_string = $management_node_info->{keys};
 	if (!$keys_string) {
-		notify($ERRORS{'WARNING'}, 0, "no identity key paths are configured for the management node");
-		return ();
+		return ('/etc/vcl/vcl.key');
 	}
 	
 	return split(/\s*[,;]\s*/, $keys_string);

Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=1801787&r1=1801786&r2=1801787&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Wed Jul 12 23:06:01 2017
@@ -9527,7 +9527,7 @@ EOF
 
 	# Check to make sure rows were returned
 	if (!@combined_rows) {
-		notify($ERRORS{'WARNING'}, 0, "0 rows were retrieved from winProductKey table for affiliation=$affiliation_identifier, product=$product_name");
+		notify($ERRORS{'OK'}, 0, "winProductKey table does not contain information for affiliation: $affiliation_identifier, product: '$product_name'");
 		return;
 	}
 	notify($ERRORS{'DEBUG'}, 0, "retrieved rows from winProductKey table for affiliation=$affiliation_identifier, product=$product_name:\n" . format_data(\@combined_rows));
@@ -9926,7 +9926,7 @@ EOF
 
 	# Check to make sure rows were returned
 	if (!@combined_rows) {
-		notify($ERRORS{'WARNING'}, 0, "0 rows were retrieved from winKMS table for affiliation=$affiliation_identifier");
+		notify($ERRORS{'OK'}, 0, "entry does not exist in winKMS table for affiliation=$affiliation_identifier");
 		return;
 	}
 	

Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm
URL: http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm?rev=1801787&r1=1801786&r2=1801787&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows/Version_6.pm Wed Jul 12 23:06:01 2017
@@ -332,7 +332,7 @@ sub activate_kms {
 	# Get the KMS server info from the winKMS table
 	my $kms_server_info = $self->get_kms_servers();
 	if (!$kms_server_info) {
-		notify($ERRORS{'WARNING'}, 0, "KMS server information could not be retrieved");
+		notify($ERRORS{'OK'}, 0, "unable to activate because the database does not contain the necessary KMS server information");
 		return;
 	}