Merge pull request #2734 from tvpartytonight/FACT-3463

(FACT-3463) Add server to mountpoint device for AIX
puppetlabs · Jun 18, 2024 · ccd3d6d · ccd3d6d
2 parents 43111c9 + 5b711a6
commit ccd3d6d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/facter/resolvers/aix/mountpoints.rb b/lib/facter/resolvers/aix/mountpoints.rb
@@ -31,9 +31,14 @@ def read_mount(fact_name)
           def add_mount_points_fact(line)
             elem = line.split("\s")
 
-            elem.shift unless line[0] == ' '
+            if line[0] != ' '
+              server = elem.shift
+              device = "#{server}:#{elem[0]}"
+            else
+              device = elem[0]
+            end
 
-            @fact_list[:mountpoints][elem[1]] = { device: elem[0], filesystem: elem[2],
+            @fact_list[:mountpoints][elem[1]] = { device: device, filesystem: elem[2],
                                                   options: elem.last.include?(':') ? [] : elem.last.split(',') }
           end
 

diff --git a/spec/facter/resolvers/aix/mountpoints_spec.rb b/spec/facter/resolvers/aix/mountpoints_spec.rb
@@ -13,7 +13,7 @@
                   filesystem: 'x', options: ['rw', 'nodev', 'log=/dev/hd3'], size: '206.64 MiB',
                   size_bytes: 216_678_912, used: '1.58 MiB', used_bytes: 1_655_296 },
       '/tmp/salam' => { available: '63.57 GiB', available_bytes: 68_253_413_376, capacity: '7.20%',
-                        device: '/var/share', filesystem: 'nfs3', options: [], size: '68.50 GiB',
+                        device: 'joe:/var/share', filesystem: 'nfs3', options: [], size: '68.50 GiB',
                         size_bytes: 73_549_217_792, used: '4.93 GiB', used_bytes: 5_295_804_416 } }
   end