seasharp
/
anvil
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Did more work on adapting tools/anvil-configure-host to work on nodes and DR hosts.

Browse Source 
* Fixed a bug in Job->get_job_details() when no job_uuid was passed.

Signed-off-by: Digimer <digimer@alteeve.ca>
main
Digimer 5 years ago
parent b97f15b25e
commit 9bcad1c4bf
5 changed files with 369 additions and 206 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      Anvil/Tools/Job.pm
  2. 152
      cgi-bin/striker
  3. 16
      html/skins/alteeve/anvil.html
  4. 6
      share/words.xml
  5. 394
      tools/anvil-configure-host

7
Anvil/Tools/Job.pm
Unescape View File

@ -166,11 +166,12 @@ sub get_job_details
job_uuid => $job_uuid, job_uuid => $job_uuid,
}}); }});
# # Were we passed a job uuid?
if ((not $job_uuid) && ($anvil->data->{switches}{'job-uuid'})) if ((not $job_uuid) && (not $anvil->data->{switches}{'job-uuid'}))
{ {
$job_uuid = $anvil->data->{switches}{'job-uuid'}; $job_uuid = $anvil->data->{switches}{'job-uuid'};
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 0, secure => 0, key => "error_0032", variables => { switch => '--job-uuid' } });
return(1);
} }
if (not $anvil->Validate->is_uuid({uuid => $anvil->data->{switches}{'job-uuid'}})) if (not $anvil->Validate->is_uuid({uuid => $anvil->data->{switches}{'job-uuid'}}))

152
cgi-bin/striker
Unescape View File

@ -767,6 +767,57 @@ sub process_prep_network
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "cgi::save::value" => $anvil->data->{cgi}{save}{value} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "cgi::save::value" => $anvil->data->{cgi}{save}{value} }});
} }
# How many actual interfaces do we have? We need at least six. For each two above that, we'll add an
# additional bond option per network.
my $interfaces = {};
my $interface_options = [];
foreach my $interface (sort {$a cmp $b} keys %{$anvil->data->{json}{all_status}{hosts}{$host_name}{network_interface}{interface}})
{
# if any interfaces are called 'virbrX-nic', ignore it as it will be removed. Likewise, ignore any 'vnetX' devices.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { interface => $interface }});
if (($interface =~ /^virbr\d+-nic/) or ($interface =~ /^vnet\d+/))
{
# Ignore it.
next;
}
# Store the mac used in the select box
my $mac_address = $anvil->data->{json}{all_status}{hosts}{$host_name}{network_interface}{interface}{$interface}{mac_address};
push @{$interface_options}, $mac_address."#!#".$interface." (".$mac_address.")";
# Store the mac address .
$interfaces->{$interface} = $mac_address;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "interfaces->{".$interface."}" => $interfaces->{$interface} }});
}
# Get the interface count
my $interface_count = keys %{$interfaces};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { interface_count => $interface_count }});
if ($interface_count < 6)
{
# Not enough interfaces.
$anvil->data->{form}{error_massage} = $anvil->Template->get({file => "main.html", name => "error_message", variables => { error_message => $anvil->Words->string({key => "warning_0015", variables => { interface_count => $interface_count } }) }});
$anvil->data->{cgi}{task}{value} = "";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
"cgi::task::value" => $anvil->data->{cgi}{task}{value},
"form::error_massage" => $anvil->data->{form}{error_massage},
}});
process_anvil_menu($anvil);
}
# TODO: For now, we're only allowing one BCN and SN. So at this time, we'll show one BCN pair, one SN
# pair and N-IFN pairs.
my $bcn_pair_count = 1;
my $sn_pair_count = 1;
my $ifn_pair_count = int(($interface_count - 4) / 2);
$ifn_pair_count = 1 if $ifn_pair_count < 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
bcn_pair_count => $bcn_pair_count,
sn_pair_count => $sn_pair_count,
ifn_pair_count => $ifn_pair_count,
}});
### NOTE: The weird 'form::config_step2::<x>::value is from reusing the logic used back when ### NOTE: The weird 'form::config_step2::<x>::value is from reusing the logic used back when
### Striker's config was made. It's not the best, but it does the job. Would be nice to redo ### Striker's config was made. It's not the best, but it does the job. Would be nice to redo
### the logic later. ### the logic later.
@ -803,6 +854,7 @@ sub process_prep_network
}); });
} }
} }
if ($anvil->data->{cgi}{gateway}{value}) if ($anvil->data->{cgi}{gateway}{value})
{ {
# Is if valid? # Is if valid?
@ -823,7 +875,7 @@ sub process_prep_network
variable_default => "", variable_default => "",
variable_description => "striker_0036", variable_description => "striker_0036",
variable_section => "config_step2", variable_section => "config_step2",
variable_source_uuid => $anvil->Get->host_uuid, variable_source_uuid => $anvil->data->{cgi}{host_uuid}{value},
variable_source_table => "hosts", variable_source_table => "hosts",
update_value_only => 1, update_value_only => 1,
}); });
@ -863,6 +915,20 @@ sub process_prep_network
{ {
my $count_key = $network."_count"; my $count_key = $network."_count";
my $loops = $anvil->data->{cgi}{$count_key}{value}; my $loops = $anvil->data->{cgi}{$count_key}{value};
# Store the network counts.
$anvil->Database->insert_or_update_variables({
debug => 3,
variable_name => "form::config_step1::".$count_key."::value",
variable_value => $anvil->data->{cgi}{$count_key}{value},
variable_default => "",
variable_description => "striker_0163",
variable_section => "config_step1",
variable_source_uuid => $anvil->data->{cgi}{host_uuid}{value},
variable_source_table => "hosts",
update_value_only => 1,
});
foreach my $i (1..$loops) foreach my $i (1..$loops)
{ {
my $this_network = $network.$i; my $this_network = $network.$i;
@ -1154,6 +1220,7 @@ sub process_prep_network
} }
# Did we see an error? # Did we see an error?
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "form::error_massage" => $anvil->data->{form}{error_massage} }});
if ($anvil->data->{form}{error_massage}) if ($anvil->data->{form}{error_massage})
{ {
# Yup, not sane, send the user back to the form. # Yup, not sane, send the user back to the form.
@ -1166,7 +1233,28 @@ sub process_prep_network
if (($anvil->data->{cgi}{confirm}{value}) && ($sane)) if (($anvil->data->{cgi}{confirm}{value}) && ($sane))
{ {
# Yes, save the job. # Yes, save the job.
my ($job_uuid) = $anvil->Database->insert_or_update_jobs({
debug => 3,
file => $THIS_FILE,
line => __LINE__,
job_host_uuid => $anvil->data->{cgi}{host_uuid}{value},
job_command => $anvil->data->{path}{exe}{'anvil-configure-host'},
job_data => "form::config_step2",
job_name => "configure::network",
job_title => "job_0001",
job_description => "job_0071",
job_progress => 0,
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { job_uuid => $job_uuid }});
# We don't need to store anything as hidden variables, we'll read it back from the database later.
$anvil->data->{form}{body} = $anvil->Template->get({file => "striker.html", name => "network_job_recorded", variables => {
reload_url => "/cgi-bin/".$THIS_FILE."?anvil=true",
title => "#!string!striker_0044!#",
description => "#!string!striker_0045!#",
}});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "form::body" => $anvil->data->{form}{body} }});
return(0);
} }
else else
{ {
@ -1178,63 +1266,17 @@ sub process_prep_network
host_uuid => $anvil->data->{cgi}{host_uuid}{value}, host_uuid => $anvil->data->{cgi}{host_uuid}{value},
gateway_interface => $gateway_interface, gateway_interface => $gateway_interface,
interfaces => $interfaces, interfaces => $interfaces,
bcn_count => $bcn_pair_count,
sn_count => $sn_pair_count,
ifn_count => $ifn_pair_count,
gateway => $anvil->data->{cgi}{gateway}{value},
dns => $anvil->data->{cgi}{dns}{value},
}}); }});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 'form::body' => $anvil->data->{form}{body} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 'form::body' => $anvil->data->{form}{body} }});
return(0); return(0);
} }
} }
# How many actual interfaces do we have? We need at least six. For each two above that, we'll add an
# additional bond option per network.
my $interfaces = {};
my $interface_options = [];
foreach my $interface (sort {$a cmp $b} keys %{$anvil->data->{json}{all_status}{hosts}{$host_name}{network_interface}{interface}})
{
# if any interfaces are called 'virbrX-nic', ignore it as it will be removed. Likewise, ignore any 'vnetX' devices.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { interface => $interface }});
if (($interface =~ /^virbr\d+-nic/) or ($interface =~ /^vnet\d+/))
{
# Ignore it.
next;
}
# Store the mac used in the select box
my $mac_address = $anvil->data->{json}{all_status}{hosts}{$host_name}{network_interface}{interface}{$interface}{mac_address};
push @{$interface_options}, $mac_address."#!#".$interface." (".$mac_address.")";
# Store the mac address .
$interfaces->{$interface} = $mac_address;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "interfaces->{".$interface."}" => $interfaces->{$interface} }});
}
# Get the interface count
my $interface_count = keys %{$interfaces};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { interface_count => $interface_count }});
if ($interface_count < 6)
{
# Not enough interfaces.
$anvil->data->{form}{error_massage} = $anvil->Template->get({file => "main.html", name => "error_message", variables => { error_message => $anvil->Words->string({key => "warning_0015", variables => { interface_count => $interface_count } }) }});
$anvil->data->{cgi}{task}{value} = "";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
"cgi::task::value" => $anvil->data->{cgi}{task}{value},
"form::error_massage" => $anvil->data->{form}{error_massage},
}});
process_anvil_menu($anvil);
}
# TODO: For now, we're only allowing one BCN and SN. So at this time, we'll show one BCN pair, one SN
# pair and N-IFN pairs.
my $bcn_pair_count = 1;
my $sn_pair_count = 1;
my $ifn_pair_count = int(($interface_count - 4) / 2);
$ifn_pair_count = 1 if $ifn_pair_count < 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
bcn_pair_count => $bcn_pair_count,
sn_pair_count => $sn_pair_count,
ifn_pair_count => $ifn_pair_count,
}});
my $interface_form = ""; my $interface_form = "";
# NOTE: We don't assign IPs at this point, unless the user manually sets one. We'll set all to 'dhcp' # NOTE: We don't assign IPs at this point, unless the user manually sets one. We'll set all to 'dhcp'
# until set during the Anvil! build later. # until set during the Anvil! build later.
@ -1331,7 +1373,7 @@ sub process_prep_network
# Host name # Host name
my $say_host_name = defined $anvil->data->{cgi}{host_name}{value} ? $anvil->data->{cgi}{host_name}{value} : $host_name; my $say_host_name = defined $anvil->data->{cgi}{host_name}{value} ? $anvil->data->{cgi}{host_name}{value} : $host_name;
my $host_name_class = $anvil->data->{cgi}{host_name}{alert} ? "input_alert" : "input_clear"; my $host_name_class = $anvil->data->{cgi}{host_name}{alert} ? "input_alert" : "input_clear";
my $say_host_name = $anvil->Template->get({file => "main.html", name => "input_text_form", variables => { my $host_name_form = $anvil->Template->get({file => "main.html", name => "input_text_form", variables => {
name => "host_name", name => "host_name",
id => "host_name", id => "host_name",
field => "#!string!striker_0016!#", field => "#!string!striker_0016!#",
@ -1377,7 +1419,7 @@ sub process_prep_network
interface_form => $interface_form, interface_form => $interface_form,
gateway_form => $say_gateway, gateway_form => $say_gateway,
dns_form => $say_dns, dns_form => $say_dns,
host_name_form => $say_host_name, host_name_form => $host_name_form,
bcn_count => $bcn_pair_count, bcn_count => $bcn_pair_count,
sn_count => $sn_pair_count, sn_count => $sn_pair_count,
ifn_count => $ifn_pair_count, ifn_count => $ifn_pair_count,

16
html/skins/alteeve/anvil.html
Unescape View File

@ -109,6 +109,20 @@
</table> </table>
<!-- end network_interface_form --> <!-- end network_interface_form -->
<!-- start network_job_recorded -->
<table>
<tr>
<td>
<span class="config_header2">#!string!striker_0044!#</span><br />
<span class="config_header3">#!string!striker_0161!#</span>
<br />
<hr />
<a href="/cgi-bin/striker?anvil=true" class="button">#!string!striker_0162!#</a>
</td>
</tr>
</table>
<!-- end network_job_recorded -->
<!-- start config-network-main --> <!-- start config-network-main -->
<table align="center" class="anvil_main_menu"> <table align="center" class="anvil_main_menu">
<script type="text/javascript" src="/skins/alteeve/anvil.js"></script> <script type="text/javascript" src="/skins/alteeve/anvil.js"></script>
@ -303,6 +317,8 @@
<input type="hidden" name="bcn_count" id="bcn_count" value="#!variable!bcn_count!#"> <input type="hidden" name="bcn_count" id="bcn_count" value="#!variable!bcn_count!#">
<input type="hidden" name="sn_count" id="sn_count" value="#!variable!sn_count!#"> <input type="hidden" name="sn_count" id="sn_count" value="#!variable!sn_count!#">
<input type="hidden" name="ifn_count" id="ifn_count" value="#!variable!ifn_count!#"> <input type="hidden" name="ifn_count" id="ifn_count" value="#!variable!ifn_count!#">
<input type="hidden" name="dns" id="dns" value="#!variable!dns!#">
<input type="hidden" name="gateway" id="gateway" value="#!variable!gateway!#">
<input type="hidden" name="gateway_interface" id="gateway_interface" value="#!variable!gateway_interface!#"> <input type="hidden" name="gateway_interface" id="gateway_interface" value="#!variable!gateway_interface!#">
<input type="hidden" name="save" id="save" value="true"> <input type="hidden" name="save" id="save" value="true">
<input type="hidden" name="anvil" id="anvil" value="true"> <input type="hidden" name="anvil" id="anvil" value="true">

6
share/words.xml
Unescape View File

@ -817,6 +817,8 @@ Here we will inject 't_0006', which injects 't_0001' which has a variable: [#!st
<key name="brand_0004">ScanCore</key> <key name="brand_0004">ScanCore</key>
<key name="brand_0005"><![CDATA[&copy; 1997 - 2019 <a href="https://alteeve.com/" target="_new">Alteeve's Niche! Inc.</a>, Toronto, Ontario, Canada]]></key> <key name="brand_0005"><![CDATA[&copy; 1997 - 2019 <a href="https://alteeve.com/" target="_new">Alteeve's Niche! Inc.</a>, Toronto, Ontario, Canada]]></key>
<key name="brand_0006"><![CDATA[<i>Anvil!</i>]]></key> <key name="brand_0006"><![CDATA[<i>Anvil!</i>]]></key>
<key name="brand_0007">Node</key>
<key name="brand_0008">DR Host</key>
<key name="header_0001">Current Network Interfaces and States</key> <key name="header_0001">Current Network Interfaces and States</key>
<key name="header_0002">MAC Address</key> <key name="header_0002">MAC Address</key>
@ -1006,6 +1008,9 @@ If you are comfortable that the target has changed for a known reason, you can s
<key name="striker_0158">If set, a bridge will be created on this network, allowing hosted servers to use this network.</key> <key name="striker_0158">If set, a bridge will be created on this network, allowing hosted servers to use this network.</key>
<key name="striker_0159">This is the host name for the target system.</key> <key name="striker_0159">This is the host name for the target system.</key>
<key name="striker_0160">The network will use DHCP to attempt to get an IP address.</key> <key name="striker_0160">The network will use DHCP to attempt to get an IP address.</key>
<key name="striker_0161">The network will soon be reconfigured and then the target will reboot. In a couple minutes, it should be ready.</key>
<key name="striker_0162">Return</key>
<key name="striker_0163">How many network connections will exist for each network type.</key>
<!-- These are generally units and appended to numbers --> <!-- These are generally units and appended to numbers -->
<key name="suffix_0001">#!variable!number!#/sec</key> <key name="suffix_0001">#!variable!number!#/sec</key>
@ -1147,6 +1152,7 @@ Failure! The return code: [#!variable!return_code!#] was received ('0' was expec
<key name="job_0068">Adding the database connection information for the dashboard: [#!variable!host_name!#] to the target's anvil.conf file.</key> <key name="job_0068">Adding the database connection information for the dashboard: [#!variable!host_name!#] to the target's anvil.conf file.</key>
<key name="job_0069">Unable to find a matching network, skipping this database.</key> <key name="job_0069">Unable to find a matching network, skipping this database.</key>
<key name="job_0070">Something went wrong adding this database. Please see: [#!data!path::log::main!#] for details.</key> <key name="job_0070">Something went wrong adding this database. Please see: [#!data!path::log::main!#] for details.</key>
<key name="job_0071">The network configuration will be updated based on the variables stored in the database. When complete, the system will reboot.</key>
<!-- Warnings --> <!-- Warnings -->
<key name="warning_0001">The IP address will change. You will need to reconnect after applying these changes.</key> <key name="warning_0001">The IP address will change. You will need to reconnect after applying these changes.</key>

394
tools/anvil-configure-host
Unescape View File

@ -27,16 +27,14 @@ if (($running_directory =~ /^\./) && ($ENV{PWD}))
# Turn off buffering so that the pinwheel will display while waiting for the SSH call(s) to complete. # Turn off buffering so that the pinwheel will display while waiting for the SSH call(s) to complete.
$| = 1; $| = 1;
my $anvil = Anvil::Tools->new({log_level => 2, log_secure => 1}); my $anvil = Anvil::Tools->new();
$anvil->Log->level({set => 2});
$anvil->Log->secure({set => 1});
# Read switches # Read switches
$anvil->data->{switches}{'no-reboot'} = 0; $anvil->data->{switches}{'no-reboot'} = 0;
$anvil->Get->switches; $anvil->Get->switches;
# Paths
$anvil->Storage->read_config({file => $anvil->data->{path}{configs}{'anvil.conf'}});
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, secure => 0, key => "log_0115", variables => { program => $THIS_FILE }});
# Make sure we're running as 'root' # Make sure we're running as 'root'
# $< == real UID, $> == effective UID # $< == real UID, $> == effective UID
if (($< != 0) && ($> != 0)) if (($< != 0) && ($> != 0))
@ -57,11 +55,11 @@ if (not $anvil->data->{sys}{database}{connections})
$anvil->nice_exit({exit_code => 2}); $anvil->nice_exit({exit_code => 2});
} }
pickup_job_details($anvil);
# Set maintenance mode # Set maintenance mode
$anvil->System->maintenance_mode({set => 1}); $anvil->System->maintenance_mode({set => 1});
pickup_job_details($anvil);
my ($reboot_needed) = reconfigure_network($anvil); my ($reboot_needed) = reconfigure_network($anvil);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, secure => 0, list => { reboot_needed => $reboot_needed }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, secure => 0, list => { reboot_needed => $reboot_needed }});
@ -114,16 +112,14 @@ sub update_passwords
{ {
my ($anvil) = @_; my ($anvil) = @_;
# Is this a striker dashboard, node or DR host? # Have we been asked to set a password?
my $type = $anvil->System->get_host_type(); $anvil->data->{variables}{form}{config_step2}{striker_password}{value} = "" if not defined $anvil->data->{variables}{form}{config_step2}{striker_password}{value};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => { type => $type }}); if ($anvil->data->{variables}{form}{config_step2}{striker_password}{value})
if ($type eq "dashboard")
{ {
# Set the passwords # Set the passwords
my $password = $anvil->data->{variables}{form}{config_step2}{striker_password}{value}; my $password = $anvil->data->{variables}{form}{config_step2}{striker_password}{value};
my $temp_file = "/tmp/anvil-".$anvil->Get->uuid; my $temp_file = "/tmp/anvil-".$anvil->Get->uuid;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 1, list => { password => $password }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, secure => 1, list => { password => $password }});
# Write the password into a temporary file. # Write the password into a temporary file.
my $error = $anvil->Storage->write_file({ my $error = $anvil->Storage->write_file({
@ -162,17 +158,6 @@ sub update_passwords
} }
} }
} }
else
{
if ($type eq "node")
{
# We'll need to update pcsd's password as well.
}
# Set passwords that are common to nodes and DR hosts.
}
$anvil->Job->update_progress({ $anvil->Job->update_progress({
progress => 95, progress => 95,
@ -188,59 +173,93 @@ sub reconfigure_network
my ($anvil) = @_; my ($anvil) = @_;
my $reboot_needed = 0; my $reboot_needed = 0;
my $prefix = $anvil->data->{variables}{form}{config_step1}{prefix}{value}; my $prefix = exists $anvil->data->{variables}{form}{config_step1}{prefix}{value} ? $anvil->data->{variables}{form}{config_step1}{prefix}{value} : "";
my $sequence = $anvil->data->{variables}{form}{config_step1}{sequence}{value}; my $sequence = exists $anvil->data->{variables}{form}{config_step1}{sequence}{value} ? $anvil->data->{variables}{form}{config_step1}{sequence}{value} : "";
my $domain = $anvil->data->{variables}{form}{config_step1}{domain}{value}; my $domain = exists $anvil->data->{variables}{form}{config_step1}{domain}{value} ? $anvil->data->{variables}{form}{config_step1}{domain}{value} : "";
my $organization = $anvil->data->{variables}{form}{config_step1}{organization}{value}; my $organization = exists $anvil->data->{variables}{form}{config_step1}{organization}{value} ? $anvil->data->{variables}{form}{config_step1}{organization}{value} : "";
my $bcn_count = 1; # TODO: This should be coming from the form, even though it's only '1' for now. my $bcn_count = exists $anvil->data->{variables}{form}{config_step1}{bcn_count}{value} ? $anvil->data->{variables}{form}{config_step1}{bcn_count}{value} : 1;
my $sn_count = 0; # TODO: This should be coming from the form, even though it's always '0' for Strikers. my $sn_count = exists $anvil->data->{variables}{form}{config_step1}{sn_count}{value} ? $anvil->data->{variables}{form}{config_step1}{sn_count}{value} : 0;
my $ifn_count = $anvil->data->{variables}{form}{config_step1}{ifn_count}{value}; my $ifn_count = exists $anvil->data->{variables}{form}{config_step1}{ifn_count}{value} ? $anvil->data->{variables}{form}{config_step1}{ifn_count}{value} : 1;
my $new_host_name = defined $anvil->data->{variables}{form}{config_step2}{host_name}{value} ? $anvil->data->{variables}{form}{config_step2}{host_name}{value} : $prefix."-striker".sprintf("%02d", $sequence).".".$domain; my $new_host_name = exists $anvil->data->{variables}{form}{config_step2}{host_name}{value} ? $anvil->data->{variables}{form}{config_step2}{host_name}{value} : "";
my $pretty_host_name = $organization." - Striker ".sprintf("%02d", $sequence); my $type = $anvil->System->get_host_type();
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => {
prefix => $prefix, prefix => $prefix,
sequence => $sequence, sequence => $sequence,
domain => $domain, domain => $domain,
organization => $organization, organization => $organization,
bcn_count => $bcn_count, bcn_count => $bcn_count,
ifn_count => $ifn_count, sn_count => $sn_count,
new_host_name => $new_host_name, ifn_count => $ifn_count,
pretty_host_name => $pretty_host_name, new_host_name => $new_host_name,
type => $type,
}}); }});
# Set the host_name # If we're configuring a dashboard and no host name was given, generate it.
my ($host_name, $descriptive_host_name) = $anvil->System->host_name({set => $new_host_name, pretty => $pretty_host_name, debug => 3}); if (($type eq "dashboard") && (not $new_host_name))
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
host_name => $host_name,
descriptive_host_name => $descriptive_host_name,
}});
if ($host_name eq $new_host_name)
{ {
# Success $new_host_name = $prefix."-striker".sprintf("%02d", $sequence).".".$domain;
$anvil->Job->update_progress({ $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, secure => 0, list => { new_host_name => $new_host_name }});
progress => 10,
message => "message_0016,!!host_name!$new_host_name!!",
job_uuid => $anvil->data->{job}{uuid},
});
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "message_0016", variables => { host_name => $new_host_name }});
} }
else
if ($new_host_name)
{ {
# Failed my $type_name = "";
$anvil->Job->update_progress({ if ($type eq "dashboard")
progress => 0, {
message => "message_0017,!!host_name!$new_host_name!!,!!bad_host_name!$host_name!!", $type_name = $anvil->Words->string({key => "brand_0003"});
job_uuid => $anvil->data->{job}{uuid}, $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => { type_name => $type_name }});
}); }
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, key => "message_0017", variables => { elsif ($type eq "node")
host_name => $new_host_name, {
bad_host_name => $host_name, $type_name = $anvil->Words->string({key => "brand_0007"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => { type_name => $type_name }});
}
elsif ($type eq "dr")
{
$type_name = $anvil->Words->string({key => "brand_0008"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => { type_name => $type_name }});
}
my $pretty_host_name = $new_host_name;
if (($organization) && ($sequence))
{
$pretty_host_name = $organization." - ".$type_name." ".sprintf("%02d", $sequence);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, secure => 0, list => { pretty_host_name => $pretty_host_name }});
}
# Set the host_name
my ($host_name, $descriptive_host_name) = $anvil->System->host_name({set => $new_host_name, pretty => $pretty_host_name, debug => 3});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => {
host_name => $host_name,
descriptive_host_name => $descriptive_host_name,
}}); }});
$anvil->nice_exit({code => 4}); if ($host_name eq $new_host_name)
{
# Success
$anvil->Job->update_progress({
progress => 10,
message => "message_0016,!!host_name!$new_host_name!!",
job_uuid => $anvil->data->{job}{uuid},
});
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 2, key => "message_0016", variables => { host_name => $new_host_name }});
}
else
{
# Failed
$anvil->Job->update_progress({
progress => 0,
message => "message_0017,!!host_name!$new_host_name!!,!!bad_host_name!$host_name!!",
job_uuid => $anvil->data->{job}{uuid},
});
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, key => "message_0017", variables => {
host_name => $new_host_name,
bad_host_name => $host_name,
}});
$anvil->nice_exit({code => 4});
}
} }
# Get the current list of IPs and MAC addresses. # Get the current list of IPs and MAC addresses.
$anvil->Network->get_ips(); $anvil->Network->get_ips({debug => 2});
# Now configure the network. # Now configure the network.
my $dns = defined $anvil->data->{variables}{form}{config_step2}{dns}{value} ? [split/,/, $anvil->data->{variables}{form}{config_step2}{dns}{value}] : []; my $dns = defined $anvil->data->{variables}{form}{config_step2}{dns}{value} ? [split/,/, $anvil->data->{variables}{form}{config_step2}{dns}{value}] : [];
@ -248,7 +267,7 @@ sub reconfigure_network
for (my $i = 0; $i < @{$dns}; $i++) for (my $i = 0; $i < @{$dns}; $i++)
{ {
$dns->[$i] = $anvil->Words->clean_spaces({ string => $dns->[$i] }); $dns->[$i] = $anvil->Words->clean_spaces({ string => $dns->[$i] });
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "dns->[$i]" => $dns->[$i] }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "dns->[$i]" => $dns->[$i] }});
} }
my $gateway = defined $anvil->data->{variables}{form}{config_step2}{gateway}{value} ? $anvil->data->{variables}{form}{config_step2}{gateway}{value} : ""; my $gateway = defined $anvil->data->{variables}{form}{config_step2}{gateway}{value} ? $anvil->data->{variables}{form}{config_step2}{gateway}{value} : "";
@ -275,22 +294,26 @@ sub reconfigure_network
my $link2_key = $this_network."_link2_mac_to_set"; my $link2_key = $this_network."_link2_mac_to_set";
my $subnet_mask_key = $this_network."_subnet_mask"; my $subnet_mask_key = $this_network."_subnet_mask";
my $ip_key = $this_network."_ip"; my $ip_key = $this_network."_ip";
my $is_gateway = $this_network eq $gateway_interface ? 1 : 0; my $bridge_key = $this_network."_create_bridge";
my $link1_mac = $anvil->data->{variables}{form}{config_step2}{$link1_key}{value}; my $link1_mac = $anvil->data->{variables}{form}{config_step2}{$link1_key}{value};
my $link2_mac = defined $anvil->data->{variables}{form}{config_step2}{$link2_key}{value} ? $anvil->data->{variables}{form}{config_step2}{$link2_key}{value} : ""; my $is_gateway = $this_network eq $gateway_interface ? 1 : 0;
my $old_link1_iface = $anvil->data->{sys}{mac}{$link1_mac}{iface} ? $anvil->data->{sys}{mac}{$link1_mac}{iface} : ""; my $link2_mac = defined $anvil->data->{variables}{form}{config_step2}{$link2_key}{value} ? $anvil->data->{variables}{form}{config_step2}{$link2_key}{value} : "";
my $old_link2_iface = defined $anvil->data->{sys}{mac}{$link2_mac}{iface} ? $anvil->data->{sys}{mac}{$link2_mac}{iface} : ""; my $old_link1_iface = $anvil->data->{sys}{mac}{$link1_mac}{iface} ? $anvil->data->{sys}{mac}{$link1_mac}{iface} : "";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { my $old_link2_iface = defined $anvil->data->{sys}{mac}{$link2_mac}{iface} ? $anvil->data->{sys}{mac}{$link2_mac}{iface} : "";
my $bridge = defined $anvil->data->{variables}{form}{config_step2}{$bridge_key}{value} ? $anvil->data->{variables}{form}{config_step2}{$bridge_key}{value} : 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
ip_key => $ip_key, ip_key => $ip_key,
is_gateway => $is_gateway, is_gateway => $is_gateway,
link1_key => $link1_key, link1_key => $link1_key,
link1_mac => $link1_mac, link1_mac => $link1_mac,
link2_key => $link2_key, link2_key => $link2_key,
link2_mac => $link2_mac, link2_mac => $link2_mac,
bridge_key => $bridge_key,
old_link1_iface => $old_link1_iface, old_link1_iface => $old_link1_iface,
old_link2_iface => $old_link2_iface, old_link2_iface => $old_link2_iface,
subnet_mask_key => $subnet_mask_key, subnet_mask_key => $subnet_mask_key,
this_network => $this_network, this_network => $this_network,
bridge => $bridge,
}}); }});
# Skip if this doesn't exist or isn't a valid IPv4 address. # Skip if this doesn't exist or isn't a valid IPv4 address.
@ -301,9 +324,11 @@ sub reconfigure_network
} }
else else
{ {
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "variables::form::config_step2::${ip_key}::value" => $anvil->data->{variables}{form}{config_step2}{$ip_key}{value} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "variables::form::config_step2::${ip_key}::value" => $anvil->data->{variables}{form}{config_step2}{$ip_key}{value} }});
} }
if (($anvil->data->{variables}{form}{config_step2}{$ip_key}{value}) and (not $anvil->Validate->is_ipv4({ip => $anvil->data->{variables}{form}{config_step2}{$ip_key}{value}}))) if (($anvil->data->{variables}{form}{config_step2}{$ip_key}{value}) &&
($anvil->data->{variables}{form}{config_step2}{$ip_key}{value} ne "dhcp") &&
(not $anvil->Validate->is_ipv4({ip => $anvil->data->{variables}{form}{config_step2}{$ip_key}{value}})))
{ {
# Something was set, but it isn't valid. # Something was set, but it isn't valid.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, key => "log_0148", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 0, key => "log_0148", variables => {
@ -313,21 +338,22 @@ sub reconfigure_network
next; next;
} }
my $ip = $anvil->data->{variables}{form}{config_step2}{$ip_key}{value}; # The IP could be 'dhcp', we'll handle that in a bit.
my $subnet_mask = $anvil->data->{variables}{form}{config_step2}{$subnet_mask_key}{value}; my $ip_address = $anvil->data->{variables}{form}{config_step2}{$ip_key}{value};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { my $subnet_mask = defined $anvil->data->{variables}{form}{config_step2}{$subnet_mask_key}{value} ? $anvil->data->{variables}{form}{config_step2}{$subnet_mask_key}{value} : "";
ip => $ip, $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
ip_address => $ip_address,
subnet_mask => $subnet_mask, subnet_mask => $subnet_mask,
}}); }});
# Are we building bonded interfaces? # Are we building bonded interfaces?
if ($anvil->Validate->is_mac({mac => $link2_mac})) if ($anvil->Validate->is_mac({mac => $link2_mac}))
{ {
### TODO: Handle when bridges exist. Detect when the host is a node and/or have a "use as bridge" option? # Yup!
# Yup! Build the configs.
my $say_network = ""; my $say_network = "";
my $say_interface = ""; my $say_interface = "";
my $interface_prefix = ""; my $interface_prefix = "";
my $say_defroute = $is_gateway ? "yes" : "no";
if ($network_type eq "bcn") if ($network_type eq "bcn")
{ {
$say_network = "Back-Channel Network ".$network_count; $say_network = "Back-Channel Network ".$network_count;
@ -346,16 +372,24 @@ sub reconfigure_network
$say_interface = "ifn".$network_count; $say_interface = "ifn".$network_count;
$interface_prefix = "IFN"; $interface_prefix = "IFN";
} }
my $say_defroute = $is_gateway ? "yes" : "no";
my $cidr = $anvil->Convert->cidr({subnet_mask => $subnet_mask}); # Gather variables
my $bond_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Bond_1"; my $cidr = $ip_address eq "dhcp" ? "" : $anvil->Convert->cidr({subnet_mask => $subnet_mask});
my $new_link1_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Link_1"; my $bridge_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Bridge_1";
my $new_link2_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Link_2"; my $bond_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Bond_1";
my $old_link1_file = $new_link1_file; my $new_link1_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Link_1";
my $old_link2_file = $new_link2_file; my $new_link2_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$interface_prefix."_".$network_count."_-_Link_2";
my $new_bond_iface = $say_interface."_bond1"; my $old_link1_file = $new_link1_file;
my $new_link1_iface = $say_interface."_link1"; my $old_link2_file = $new_link2_file;
my $new_link2_iface = $say_interface."_link2"; my $new_bridge_iface = $say_interface."_bridge1";
my $new_bond_iface = $say_interface."_bond1";
my $new_link1_iface = $say_interface."_link1";
my $new_link2_iface = $say_interface."_link2";
my $boot_proto = $ip_address eq "dhcp" ? "dhcp" : "none";
my $bridge_uuid = get_uuid_from_interface_file($anvil, $bridge_file);
my $bond_uuid = get_uuid_from_interface_file($anvil, $bond_file);
my $link1_uuid = get_uuid_from_interface_file($anvil, $old_link1_file);
my $link2_uuid = get_uuid_from_interface_file($anvil, $old_link2_file);
if ((exists $anvil->data->{sys}{mac}{$link1_mac}{iface}) && ($anvil->data->{sys}{mac}{$link1_mac}{iface})) if ((exists $anvil->data->{sys}{mac}{$link1_mac}{iface}) && ($anvil->data->{sys}{mac}{$link1_mac}{iface}))
{ {
$old_link1_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$anvil->data->{sys}{mac}{$link1_mac}{iface}; $old_link1_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$anvil->data->{sys}{mac}{$link1_mac}{iface};
@ -364,30 +398,61 @@ sub reconfigure_network
{ {
$old_link2_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$anvil->data->{sys}{mac}{$link2_mac}{iface}; $old_link2_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$anvil->data->{sys}{mac}{$link2_mac}{iface};
} }
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
say_defroute => $say_defroute, bond_file => $bond_file,
cidr => $cidr, bond_uuid => $bond_uuid,
bond_file => $bond_file, boot_proto => $boot_proto,
new_link1_file => $new_link1_file, bridge_file => $bridge_file,
new_link2_file => $new_link2_file, bridge_uuid => $bridge_uuid,
old_link1_file => $old_link1_file, cidr => $cidr,
old_link2_file => $old_link2_file, link1_uuid => $link1_uuid,
new_bond_iface => $new_bond_iface, link2_uuid => $link2_uuid,
new_link1_iface => $new_link1_iface, new_bond_iface => $new_bond_iface,
new_link2_iface => $new_link2_iface, new_bridge_iface => $new_bridge_iface,
new_link1_file => $new_link1_file,
new_link1_iface => $new_link1_iface,
new_link2_file => $new_link2_file,
new_link2_iface => $new_link2_iface,
old_link1_file => $old_link1_file,
old_link2_file => $old_link2_file,
say_defroute => $say_defroute,
}}); }});
# Gather (or create) UUIDs # Are we building a bridge interface?
my $bond_uuid = get_uuid_from_interface_file($anvil, $bond_file); my $bridge_config = "";
my $link1_uuid = get_uuid_from_interface_file($anvil, $old_link1_file); if ($bridge)
my $link2_uuid = get_uuid_from_interface_file($anvil, $old_link2_file); {
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { # Yup!
bond_uuid => $bond_uuid, $bridge_config = "# $say_network - Bridge 1\n";
link1_uuid => $link1_uuid, $bridge_config .= "UUID=\"".$bond_uuid."\"\n";
link2_uuid => $link2_uuid, $bridge_config .= "TYPE=\"Bridge\"\n";
}}); $bridge_config .= "DEVICE=\"".$new_bridge_iface."\"\n";
$bridge_config .= "NAME=\"".$interface_prefix." ".$network_count." - Bridge 1\"\n";
$bridge_config .= "ONBOOT=\"yes\"\n";
$bridge_config .= "STP=\"yes\"\n";
$bridge_config .= "BRIDGING_OPTS=\"priority=32768\"\n";
$bridge_config .= "BROWSER_ONLY=\"no\"\n";
$bridge_config .= "BOOTPROTO=\"".$boot_proto."\"\n";
# If the IP is NOT 'dhcp', set it.
if ($ip_address ne "dhcp")
{
$bridge_config .= "IPADDR=\"".$ip_address."\"\n";
$bridge_config .= $cidr ? "PREFIX=\"".$cidr."\"\n" : "NETMASK=\"".$subnet_mask."\"\n";
}
# If this is the default gateway, add that info.
if ($is_gateway)
{
$bridge_config .= "GATEWAY=\"".$gateway."\"\n";
for (my $i = 0; $i < @{$dns}; $i++)
{
$bridge_config .= "DNS".($i+1)."=\"".$dns->[$i]."\"\n";
}
}
$bridge_config .= "DEFROUTE=\"".$say_defroute."\"\n";
$bridge_config .= "ZONE=\"".uc($say_interface)."\"";
}
### TODO: Set the firewall Zone appropriately.
# Build the Bond config. # Build the Bond config.
my $bond_config = "# $say_network - Bond 1\n"; my $bond_config = "# $say_network - Bond 1\n";
$bond_config .= "UUID=\"".$bond_uuid."\"\n"; $bond_config .= "UUID=\"".$bond_uuid."\"\n";
@ -396,20 +461,34 @@ sub reconfigure_network
$bond_config .= "BONDING_OPTS=\"mode=active-backup primary=".$say_interface."_link1 updelay=120000 downdelay=0 miimon=100 primary_reselect=better\"\n"; $bond_config .= "BONDING_OPTS=\"mode=active-backup primary=".$say_interface."_link1 updelay=120000 downdelay=0 miimon=100 primary_reselect=better\"\n";
$bond_config .= "TYPE=\"Bond\"\n"; $bond_config .= "TYPE=\"Bond\"\n";
$bond_config .= "BONDING_MASTER=\"yes\"\n"; $bond_config .= "BONDING_MASTER=\"yes\"\n";
$bond_config .= "BOOTPROTO=\"none\"\n";
$bond_config .= "IPV6INIT=\"no\"\n"; $bond_config .= "IPV6INIT=\"no\"\n";
$bond_config .= "ONBOOT=\"yes\"\n"; $bond_config .= "ONBOOT=\"yes\"\n";
$bond_config .= "IPADDR=\"".$ip."\"\n"; $bond_config .= "BOOTPROTO=\"".$boot_proto."\"\n";
$bond_config .= $cidr ? "PREFIX=\"".$cidr."\"\n" : "NETMASK=\"".$subnet_mask."\"\n"; # If this is a connected to a bridge, we specify as much.
if ($is_gateway) if ($bridge)
{ {
$bond_config .= "GATEWAY=\"".$gateway."\"\n"; $bond_config .= "BRIDGE=\"".$new_bridge_iface."\"\n";
for (my $i = 0; $i < @{$dns}; $i++) }
else
{
# If the ip is NOT 'dhcp', set the ip and subnet
if ($ip_address ne "dhcp")
{
# This bond has an IP, set it
$bond_config .= "IPADDR=\"".$ip_address."\"\n";
$bond_config .= $cidr ? "PREFIX=\"".$cidr."\"\n" : "NETMASK=\"".$subnet_mask."\"\n";
}
# Is this the default gateway?
if ($is_gateway)
{ {
$bond_config .= "DNS".($i+1)."=\"".$dns->[$i]."\"\n"; $bond_config .= "GATEWAY=\"".$gateway."\"\n";
for (my $i = 0; $i < @{$dns}; $i++)
{
$bond_config .= "DNS".($i+1)."=\"".$dns->[$i]."\"\n";
}
} }
$bond_config .= "DEFROUTE=\"".$say_defroute."\"\n";
} }
$bond_config .= "DEFROUTE=\"".$say_defroute."\"\n";
$bond_config .= "ZONE=\"".uc($say_interface)."\""; $bond_config .= "ZONE=\"".uc($say_interface)."\"";
my $link1_config = "# $say_network - Link 1\n"; my $link1_config = "# $say_network - Link 1\n";
@ -445,12 +524,17 @@ sub reconfigure_network
$link2_config .= "ZONE=\"".uc($say_interface)."\""; $link2_config .= "ZONE=\"".uc($say_interface)."\"";
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
bond_config => $bond_config, bridge_config => $bridge_config,
link1_config => $link1_config, bond_config => $bond_config,
link2_config => $link2_config, link1_config => $link1_config,
link2_config => $link2_config,
}}); }});
# Make backups of existing files # Make backups of existing files
if (-e $bridge_file)
{
$anvil->Storage->backup({debug => 2, file => $bridge_file});
}
if (-e $bond_file) if (-e $bond_file)
{ {
$anvil->Storage->backup({debug => 2, file => $bond_file}); $anvil->Storage->backup({debug => 2, file => $bond_file});
@ -474,11 +558,13 @@ sub reconfigure_network
### Write out the new configs ### Write out the new configs
# Bond, Link 1 and Link 2 # Bond, Link 1 and Link 2
$anvil->Storage->write_file({file => $bond_file, body => $bond_config, user => "root", group => "root", mode => "0644", overwrite => 1}); $anvil->Storage->write_file({file => $bridge_file, body => $bridge_config, user => "root", group => "root", mode => "0644", overwrite => 1});
$anvil->Storage->write_file({file => $new_link1_file, body => $link1_config, user => "root", group => "root", mode => "0644", overwrite => 1}); $anvil->Storage->write_file({file => $bond_file, body => $bond_config, user => "root", group => "root", mode => "0644", overwrite => 1});
$anvil->Storage->write_file({file => $new_link2_file, body => $link2_config, user => "root", group => "root", mode => "0644", overwrite => 1}); $anvil->Storage->write_file({file => $new_link1_file, body => $link1_config, user => "root", group => "root", mode => "0644", overwrite => 1});
$anvil->Storage->write_file({file => $new_link2_file, body => $link2_config, user => "root", group => "root", mode => "0644", overwrite => 1});
### NOTE: Everything except the unlink is disabled until we sort out the reload ### NOTE: Everything except the unlink is disabled until we sort out the
### reload without reboot.
# Shut down (and rename) Link 1 # Shut down (and rename) Link 1
if ($old_link1_iface) if ($old_link1_iface)
{ {
@ -546,9 +632,12 @@ sub reconfigure_network
} }
elsif ((exists $anvil->data->{variables}{form}{config_step2}{$link1_key}{value}) && ($anvil->Validate->is_mac({mac => $anvil->data->{variables}{form}{config_step2}{$link1_key}{value}}))) elsif ((exists $anvil->data->{variables}{form}{config_step2}{$link1_key}{value}) && ($anvil->Validate->is_mac({mac => $anvil->data->{variables}{form}{config_step2}{$link1_key}{value}})))
{ {
### NOTE: This only applies when configuring Striker dashboards. They can't
### be 'dhcp', either, so no checks are made for those cases. Likewise,
### bridges are not used.
# Single interface, set it up # Single interface, set it up
my $link1_mac = $anvil->data->{variables}{form}{config_step2}{$link1_key}{value}; my $link1_mac = $anvil->data->{variables}{form}{config_step2}{$link1_key}{value};
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { link1_mac => $link1_mac }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { link1_mac => $link1_mac }});
my $say_network = ""; my $say_network = "";
my $say_interface = ""; my $say_interface = "";
@ -580,17 +669,17 @@ sub reconfigure_network
{ {
$old_link1_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$anvil->data->{sys}{mac}{$link1_mac}{iface}; $old_link1_file = $anvil->data->{path}{directories}{ifcfg}."/ifcfg-".$anvil->data->{sys}{mac}{$link1_mac}{iface};
} }
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
say_defroute => $say_defroute,
cidr => $cidr, cidr => $cidr,
new_link1_file => $new_link1_file, new_link1_file => $new_link1_file,
old_link1_file => $old_link1_file,
new_link1_iface => $new_link1_iface, new_link1_iface => $new_link1_iface,
old_link1_file => $old_link1_file,
say_defroute => $say_defroute,
}}); }});
# Gather (or create) UUIDs # Gather (or create) UUIDs
my $link1_uuid = get_uuid_from_interface_file($anvil, $old_link1_file); my $link1_uuid = get_uuid_from_interface_file($anvil, $old_link1_file);
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { link1_uuid => $link1_uuid }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { link1_uuid => $link1_uuid }});
my $link1_config = "# $say_network - Link 1\n"; my $link1_config = "# $say_network - Link 1\n";
$link1_config .= "HWADDR=\"".uc($link1_mac)."\"\n"; $link1_config .= "HWADDR=\"".uc($link1_mac)."\"\n";
@ -601,7 +690,7 @@ sub reconfigure_network
$link1_config .= "BOOTPROTO=\"none\"\n"; $link1_config .= "BOOTPROTO=\"none\"\n";
$link1_config .= "IPV6INIT=\"no\"\n"; $link1_config .= "IPV6INIT=\"no\"\n";
$link1_config .= "ONBOOT=\"yes\"\n"; $link1_config .= "ONBOOT=\"yes\"\n";
$link1_config .= "IPADDR=\"".$ip."\"\n"; $link1_config .= "IPADDR=\"".$ip_address."\"\n";
$link1_config .= $cidr ? "PREFIX=\"".$cidr."\"\n" : "NETMASK=\"".$subnet_mask."\"\n"; $link1_config .= $cidr ? "PREFIX=\"".$cidr."\"\n" : "NETMASK=\"".$subnet_mask."\"\n";
if ($is_gateway) if ($is_gateway)
{ {
@ -670,38 +759,38 @@ sub reconfigure_network
# If any virtio bridges exist, remove it/them. # If any virtio bridges exist, remove it/them.
my $start = 0; my $start = 0;
my ($bridges, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-list"}); my ($bridges, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-list"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { bridges => $bridges, return_code => $return_code }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { bridges => $bridges, return_code => $return_code }});
foreach my $line (split/\n/, $bridges) foreach my $line (split/\n/, $bridges)
{ {
$line = $anvil->Words->clean_spaces({string => $line}); $line = $anvil->Words->clean_spaces({string => $line});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { line => $line }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { line => $line }});
if ($line =~ /^----------/) if ($line =~ /^----------/)
{ {
$start = 1; $start = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { start => $start }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { start => $start }});
next; next;
} }
next if not $start; next if not $start;
my $bridge = ($line =~ /(.*?)\s/)[0]; my $bridge = ($line =~ /(.*?)\s/)[0];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { bridge => $bridge }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { bridge => $bridge }});
$anvil->data->{virsh}{bridge}{$bridge} = 1; $anvil->data->{virsh}{bridge}{$bridge} = 1;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { "virsh::bridge::$bridge" => $anvil->data->{virsh}{bridge}{$bridge} }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "virsh::bridge::$bridge" => $anvil->data->{virsh}{bridge}{$bridge} }});
} }
foreach my $bridge (sort {$a cmp $b} keys %{$anvil->data->{virsh}{bridge}}) foreach my $bridge (sort {$a cmp $b} keys %{$anvil->data->{virsh}{bridge}})
{ {
# Destroy (stop) it. # Destroy (stop) it.
my ($destroy, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-destroy ".$bridge}); my ($destroy, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-destroy ".$bridge});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { destroy => $destroy, return_code => $return_code }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { destroy => $destroy, return_code => $return_code }});
# Disable it from auto-start. # Disable it from auto-start.
(my $disable, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-autostart ".$bridge." --disable"}); (my $disable, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-autostart ".$bridge." --disable"});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { disable => $disable, return_code => $return_code }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { disable => $disable, return_code => $return_code }});
# Undefine (delete) # Undefine (delete)
(my $undefine, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-undefine ".$bridge}); (my $undefine, $return_code) = $anvil->System->call({shell_call => $anvil->data->{path}{exe}{virsh}." net-undefine ".$bridge});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { undefine => $undefine, return_code => $return_code }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { undefine => $undefine, return_code => $return_code }});
} }
### TODO: This isn't working... The route table won't set the IFN as the default route properly and ### TODO: This isn't working... The route table won't set the IFN as the default route properly and
@ -764,17 +853,19 @@ sub pickup_job_details
my ($anvil) = @_; my ($anvil) = @_;
# If this returns '1', the job-uuid was bad. If it returns '2', another process is running. # If this returns '1', the job-uuid was bad. If it returns '2', another process is running.
my $return = $anvil->Job->get_job_details({check => 1, job_uuid => $anvil->data->{switches}{'job-uuid'}}); my $return = $anvil->Job->get_job_details({
check => 1,
job_uuid => $anvil->data->{switches}{'job-uuid'},
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { 'return' => $return }});
if ($return == 1) if ($return == 1)
{ {
# It's not a valid UUID. # It's not a valid UUID.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { 'return' => $return }});
$anvil->nice_exit({code => 6}); $anvil->nice_exit({code => 6});
} }
if ($return == 2) if ($return == 2)
{ {
# This job is being handled by another process that is still alive. # This job is being handled by another process that is still alive.
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 1, list => { 'return' => $return }});
$anvil->nice_exit({code => 3}); $anvil->nice_exit({code => 3});
} }
@ -790,7 +881,7 @@ sub pickup_job_details
if ($job_picked_up_by) if ($job_picked_up_by)
{ {
# The previous job is gone if we're still alive, we'll take this over. # The previous job is gone if we're still alive, we'll take this over.
$anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 1, key => "log_0147", variables => { $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, level => 3, key => "log_0147", variables => {
pid => $job_picked_up_by, pid => $job_picked_up_by,
percent => $job_progress, percent => $job_progress,
}}); }});
@ -828,14 +919,21 @@ AND
my $this_variable = $row->[0]; my $this_variable = $row->[0];
my $this_value = $row->[1]; my $this_value = $row->[1];
my $secure = $this_variable =~ /passw/ ? 1 : 0; my $secure = $this_variable =~ /passw/ ? 1 : 0;
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => {
this_variable => $this_variable, 's1:this_variable' => $this_variable,
this_value => not $secure ? $this_value : $anvil->Log->is_secure($this_value), 's2:this_value' => $anvil->Log->is_secure($this_value),
}}); }});
$anvil->_make_hash_reference($anvil->data->{variables}, $this_variable, $this_value); $anvil->_make_hash_reference($anvil->data->{variables}, $this_variable, $this_value);
} }
# Clear previous data
$anvil->Job->update_progress({
progress => 0,
message => "clear",
job_uuid => $anvil->data->{job}{uuid},
});
# Record that we've picked up this job. # Record that we've picked up this job.
$anvil->Job->update_progress({ $anvil->Job->update_progress({
progress => 1, progress => 1,

Write Preview
Loading…
Cancel
Save