manageiq-appliance_console 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '09811884db4414d12dd29905002919e0af0dbfaa'
-  data.tar.gz: e7633d92380c8d5befe8cb6480338000384d01db
+SHA256:
+  metadata.gz: ce6e154b0eedf8258d81d045881f2fa43de53b72c548809b8d9e8a0714cc4ec0
+  data.tar.gz: a89730c58fe0e5887815c1ff49565f99e85cb5a9c4eba5d53e5f8db2f02b29b7
 SHA512:
-  metadata.gz: 04b07dbb6cc26aaab9806056a9b9e734adbd3e6476b9e574a8e60e22f154fad93d4a2dd5d58aef491e639e0daf1c3f09d5cbc1e99e401ee7c37376ba89cea2bd
-  data.tar.gz: cf735ee98ca35728a28d199a8413ec92cd0bee84467af60dc33170984abc95ade0609839d88d01ede5431940cf3802e5598afb32972d5bc9114b0bd19d3235bb
+  metadata.gz: 718b6480550e954f797ab9df1731c7873101dddb779309183cc31c80ec188c39c48226850caeb715e4cf6a4c61b52c341857ddf8a0c251c162bfe4c8cd5d7be1
+  data.tar.gz: 5f78670f199ea6cb3619d93175db591d99f9aedee885c798e7ddf1afdb4f12a3099975be589e2f03847768c238d15d5b069b100e4cc72ba1f582ed7b098474db

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in manageiq-smartstate.gemspec
 gemspec
 
-gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending", :branch => "master"
+gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending", :branch => "hammer"

data/lib/manageiq/appliance_console/logical_volume_management.rb

@@ -34,8 +34,9 @@ module ApplianceConsole
       create_volume_group
       create_logical_volume_to_fill_volume_group
       format_logical_volume
-      mount_disk
       update_fstab
+      lazy_unmount_mount_point
+      mount_disk
     end
 
     private
@@ -69,30 +70,32 @@ module ApplianceConsole
       AwesomeSpawn.run!("mkfs.#{filesystem_type} #{logical_volume.path}")
     end
 
+    def lazy_unmount_mount_point
+      AwesomeSpawn.run!("umount", :params => ["-l", mount_point.to_s]) if File.file?("/proc/mounts") && File.read("/proc/mounts").include?(" #{mount_point} ")
+    end
+
     def mount_disk
       if mount_point.symlink?
         FileUtils.rm_rf(mount_point)
         FileUtils.mkdir_p(mount_point)
       end
-      AwesomeSpawn.run!("mount", :params => {"-t" => filesystem_type,
-                                             nil  => [logical_volume.path, mount_point]})
+      AwesomeSpawn.run!("mount", :params => ["-a"])
     end
 
     def update_fstab
       fstab = LinuxAdmin::FSTab.instance
-      return if fstab.entries.find { |e| e.mount_point == mount_point }
+      entry = fstab.entries.find { |e| e.mount_point == mount_point.to_s } || LinuxAdmin::FSTabEntry.new
+      fstab.entries.delete(entry)
 
-      entry = LinuxAdmin::FSTabEntry.new(
-        :device        => logical_volume.path,
-        :mount_point   => mount_point,
-        :fs_type       => filesystem_type,
-        :mount_options => "rw,noatime",
-        :dumpable      => 0,
-        :fsck_order    => 0
-      )
+      entry.device        = logical_volume_path
+      entry.mount_point   = mount_point
+      entry.fs_type       = filesystem_type
+      entry.mount_options = "rw,noatime"
+      entry.dumpable      = 0
+      entry.fsck_order    = 0
 
       fstab.entries << entry
-      fstab.write! # Test this more, whitespace is removed
+      fstab.write!
     end
   end
 end

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '3.3.1'.freeze
+    VERSION = '3.3.2'.freeze
   end
 end

data/manageiq-appliance_console.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bcrypt",                  "~> 3.1.10"
   spec.add_runtime_dependency "highline",                "~> 1.6.21"
   spec.add_runtime_dependency "i18n",                    "~> 0.7"
-  spec.add_runtime_dependency "linux_admin",             ["~> 1.0", ">=1.2.2"]
+  spec.add_runtime_dependency "linux_admin",             ["~> 1.0", ">=1.2.4"]
   spec.add_runtime_dependency "pg"
   spec.add_runtime_dependency "trollop",                 "~> 2.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -103,7 +103,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: ManageIQ Appliance Console