Merge pull request #198 from ClusterLabs/anvil-tools-dev

Updated striker-prep-database to not configure the firewall if firewa…

share/words.xml

@@ -2059,6 +2059,7 @@ The file: [#!variable!file!#] needs to be updated. The difference is:
 		<key name="log_0666"><![CDATA[[ Error ] - The method Database->query() was asked to query the database with UUID: [#!variable!old_uuid!#] but there is no file handle open to the database. Switched the read to: [#!variable!new_uuid!#].]]></key>
 		<key name="log_0667">Opening the firewall zone: [#!variable!zone!#] to allow the service: [#!variable!service!#].</key>
 		<key name="log_0668">No password for the database on the host with UUID: [#!variable!uuid!#], skipping it.</key>
+		<key name="log_0669">The firewalld daemon isn't running, skipping firewall setup.</key>
 		
 		<!-- Messages for users (less technical than log entries), though sometimes used for logs, too. -->
 		<key name="message_0001">The host name: [#!variable!target!#] does not resolve to an IP address.</key>

tools/striker-prep-database

@@ -507,6 +507,14 @@ sub configure_firewall
 		output      => $output, 
 		return_code => $return_code,
 	}});
+	
+	# If the return code was 252, firewalld isn't running.
+	if ($return_code eq "252")
+	{
+		$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0669"});
+		return(0);
+	}
+	
 	foreach my $line (split/\n/, $output)
 	{
 		if ($line =~ /^\S/)