Merge pull request #1255 from jschmerge/upstream-changes

Always insert a 'volume=x' parameter into storage.config
Comcast · Apr 5, 2016 · bc08ef3 · bc08ef3
2 parents 6eec8f7 + 4024ab9
commit bc08ef3
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -815,15 +815,12 @@ sub storage_dot_config_volume_text {
     my $prefix               = shift;
     my $letters              = shift;
     my $volume               = shift;
-    my $has_multiple_volumes = shift;
 
     my $text = "";
     my @postfix = split( /,/, $letters );
     foreach my $l ( sort @postfix ) {
         $text .= $prefix . $l;
-        if ($has_multiple_volumes) {
-            $text .= " volume=" . $volume;
-        }
+        $text .= " volume=" . $volume;
         $text .= "\n";
     }
     return $text;
@@ -838,24 +835,41 @@ sub storage_dot_config {
     my $text   = $self->header_comment( $server->host_name );
     my $data   = $self->param_data( $server, $file );
 
-    my $has_multiple_volumes = get_num_volumes($data) > 1;
+    # always default to volume one and let DB params override
+    my $assigned_volume = 1;
 
     if ( defined( $data->{Drive_Prefix} ) ) {
+        if ( defined($data->{Disk_Volume} ) ) {
+            $assigned_volume = $data->{Disk_Volume};
+        }
         $text .= storage_dot_config_volume_text(
             $data->{Drive_Prefix}, $data->{Drive_Letters},
-            $data->{Disk_Volume},  $has_multiple_volumes
+            $assigned_volume
         );
     }
+
     if ( defined( $data->{RAM_Drive_Prefix} ) ) {
+		++$assigned_volume;
+
+        if ( defined($data->{RAM_Volume} ) ) {
+            $assigned_volume = $data->{RAM_Volume};
+        }
         $text .= storage_dot_config_volume_text(
             $data->{RAM_Drive_Prefix}, $data->{RAM_Drive_Letters},
-            $data->{RAM_Volume},       $has_multiple_volumes
+            $assigned_volume
         );
     }
+
+
     if ( defined( $data->{SSD_Drive_Prefix} ) ) {
+		++$assigned_volume;
+
+        if ( defined($data->{SSD_Volume} ) ) {
+            $assigned_volume = $data->{SSD_Volume};
+        }
         $text .= storage_dot_config_volume_text(
             $data->{SSD_Drive_Prefix}, $data->{SSD_Drive_Letters},
-            $data->{SSD_Volume},       $has_multiple_volumes
+            $assigned_volume
         );
     }
     return $text;