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

Anvil tools dev

anvil.spec.in

@@ -237,6 +237,8 @@ systemctl enable chronyd.service
 systemctl start chronyd.service 
 systemctl enable anvil-daemon.service
 systemctl restart anvil-daemon.service
+systemctl enable scancore.service
+systemctl restart scancore.service
 
 
 %post striker
@@ -252,9 +254,10 @@ then
     systemctl enable gdm.service
 fi
 
-echo "Preparing the database"
-striker-prep-database
-anvil-update-states
+### This is handled by anvil-daemon now
+#echo "Preparing the database"
+#striker-prep-database
+#anvil-update-states
 
 # Touch the system type file.
 echo "Touching the system type file"

share/words.xml

@@ -2060,6 +2060,7 @@ The file: [#!variable!file!#] needs to be updated. The difference is:
 		<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>
+		<key name="log_0670">The postgresql server is installed.</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>
@@ -3084,6 +3085,7 @@ The error was:
 We will sleep a bit and try again.
 		</key>
 		<key name="warning_0130">[ Warning ] - The storage group: [#!variable!storage_group_name!#] had the host: [#!variable!host_name!#] as a member. This host is not a member (anymore?) of the Anvil!: [#!variable!anvil_name!#]. Removing it from the storage group now.</key>
+		<key name="warning_0131">[ Warning ] - The postgresql server is not installed yet. Sleeping for a bit, then will check again.</key>
 
 		<!-- The entries below here are not sequential, but use a key to find the entry. -->
 		<!-- Run 'striker-parse-os-list to find new entries. --> 

tools/anvil-daemon

@@ -91,7 +91,11 @@ $anvil->System->_check_anvil_conf();
 
 # Connect to the database(s). If we have no connections, we'll proceed anyway as one of the 'run_once' tasks
 # is to setup the database server.
-$anvil->Database->connect({check_if_configured => 1, check_for_resync => 1});
+$anvil->Database->connect({
+	debug               => 2,
+	check_if_configured => 1, 
+	check_for_resync    => 1,
+});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0132"});
 
 # If I have no databases, sleep for a second and then exit (systemd will restart us).

tools/striker-prep-database

@@ -29,6 +29,8 @@ $| = 1;
 my $anvil = Anvil::Tools->new();
 
 $anvil->Get->switches;
+$anvil->Log->level({set => 2});
+$anvil->Log->secure({set => 1});
 $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "log_0115", variables => { program => $THIS_FILE }});
 
 $anvil->System->_check_anvil_conf({debug => 2});
@@ -52,15 +54,36 @@ if ($local_uuid)
 	# Check that the firewall is open.
 	configure_firewall($anvil);
 	
-	my $running = $anvil->System->check_daemon({debug => 2, daemon => $anvil->data->{sys}{daemon}{postgresql}});
-	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { running => $running }});
-	if ($running eq "2")
+	# Wait until postgresql is installed, in case we're running during initial dnf install.
+	my $installed = 0;
+	until($installed)
 	{
-		# Not installed.
-		$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, priority => "err", key => "log_0144"});
-		$anvil->nice_exit({exit_code => 5});
+		my $shell_call = $anvil->data->{path}{exe}{rpm}." -q postgresql-server";
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { shell_call => $shell_call }});
+		
+		my ($output, $return_code) = $anvil->System->call({shell_call => $shell_call, debug => 2, source => $THIS_FILE, line => __LINE__});
+		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { 
+			output      => $output, 
+			return_code => $return_code,
+		}});
+		
+		if ($return_code)
+		{
+			$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, priority => "alert", key => "warning_0131"});
+			sleep 5;
+		}
+		else
+		{
+			# Installed.
+			$installed = 1;
+			$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { installed => $installed }});
+			$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0670"});
+		}
 	}
-	elsif (not $running)
+	
+	my $running = $anvil->System->check_daemon({debug => 2, daemon => $anvil->data->{sys}{daemon}{postgresql}});
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { running => $running }});
+	if (not $running)
 	{
 		# Do we need to initialize the databae?
 		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "path::configs::pg_hba.conf" => $anvil->data->{path}{configs}{'pg_hba.conf'} }});
@@ -411,7 +434,7 @@ if ($local_uuid)
 	}
 	
 	# Remove the temporary password file.
-	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
+	$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { 
 		created_pgpass                  => $created_pgpass,
 		"path::secure::postgres_pgpass" => $anvil->data->{path}{secure}{postgres_pgpass}, 
 	}});