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

Fixed a bug where corosync's configuration of a backup ring was broken.

Anvil/Tools/System.pm

@@ -2058,7 +2058,7 @@ LIMIT 1
 			{
 				# Timed out.
 				$done = 1;
-				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, priority => "err", key => "log_0510"});
+				$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, priority => "err", key => "log_0510", variables => { ip_address => $ipmi_ip_address }});
 			}
 		}
 	}

notes

@@ -1238,14 +1238,45 @@ Oob  Type                            Admin
 oob  Out-Of-Band                     Up
 
 # Configure VLANs
-console(config)#vlan 200
+rs-striker03(config)#vlan 100              
-console(config-vlan200)#name SN     
+rs-striker03(config-vlan100)#name BCN1
+rs-striker03(config-vlan100)#interface range gi1/0/1-12,gi2/0/1-12
+rs-striker03(config-if)#switchport access vlan 100
+rs-striker03(config-if)#no shutdown 
+rs-striker03(config-if)#exit
+
+rs-striker03(config)#interface vlan 300
+rs-striker03(config)#name IFN
+rs-striker03(config-if-vlan300)#interface range gigabitethernet1/0/13-24,gigabitethernet2/0/13-24
+rs-striker03(config-if)#switchport access vlan 300
+rs-striker03(config-if)#no shutdown 
+rs-striker03(config-if)#exit
+rs-striker03(config)#exit
+
+rs-striker03#show vlan 
+
+VLAN   Name                             Ports          Type
+-----  ---------------                  -------------  --------------
+1      default                          Po1-128,       Default
+                                        Te1/0/1-4,
+                                        Te2/0/1-4
+100    BCN1                             Gi1/0/1-12,    Static
+                                        Gi2/0/1-12
+300    IFN1                             Gi1/0/13-24,   Static
+                                        Gi2/0/13-24
+
+rs-striker03#copy running-config startup-config 
+
+This operation may take few minutes.
+Management interfaces will not be available during this time.
+
+Are you sure you want to save? (y/n) y
+
+Configuration Saved!
+rs-striker03#
 
 
 
-# Form the stack;
-
-
 # Firmware update
 console#copy tftp://10.201.4.1/N2200v6.6.3.10.stk backup
 ====

tools/anvil-join-anvil

@@ -1140,8 +1140,7 @@ sub check_corosync
 		my $peer_sn_name     =  $peer_short_name.".sn1";
 		my $local_ready      =  $anvil->data->{cib}{parsed}{'local'}{ready};
 		my $local_name       =  $anvil->data->{cib}{parsed}{'local'}{name};
-		my $local_short_name =  $peer_name;
+		my $local_short_name =  $anvil->Get->short_host_name;
-		   $local_short_name =~ s/\..*$//;
 		my $local_bcn_name   =  $local_short_name.".bcn1";
 		my $local_sn_name    =  $local_short_name.".sn1";
 		$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { 
@@ -1203,7 +1202,7 @@ sub check_corosync
 						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { in_totem => $in_totem }});
 						
 						$new_corosync_conf .= $line."\n";
-						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 						next;
 					}
 					if ($line =~ /nodelist \{/)
@@ -1212,7 +1211,7 @@ sub check_corosync
 						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { waiting => $waiting }});
 						
 						$new_corosync_conf .= $line."\n";
-						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 						next;
 					}
 					
@@ -1224,7 +1223,7 @@ sub check_corosync
 							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { in_node => $in_node }});
 							
 							$new_corosync_conf .= $line."\n";
-							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 							next;
 						}
 						if ($in_node)
@@ -1319,7 +1318,7 @@ sub check_corosync
 							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { in_nodelist => $in_nodelist }});
 							
 							$new_corosync_conf .= $line."\n";
-							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 							next;
 						}
 					}
@@ -1330,10 +1329,10 @@ sub check_corosync
 							if (not $token_seen)
 							{
 								$new_corosync_conf .= "    token: 10000\n";
-								$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+								$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 							}
 							$new_corosync_conf .= $line."\n";
-							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 							
 							$in_totem   = 0;
 							$token_seen = 0;
@@ -1349,7 +1348,7 @@ sub check_corosync
 							$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { waiting => $waiting }});
 						}
 						$new_corosync_conf .= $line."\n";
-						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { new_corosync_conf => $new_corosync_conf }});
+						$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { new_corosync_conf => $new_corosync_conf }});
 					}
 					else
 					{