Merge pull request #52 from bdunne/fstab_doesnt_exist_on_rhel_containers

Skip editing /etc/fstab if it doesn't exist

db/migrate/20170512233333_drop_miq_server_rhn_mirror.rb

@@ -30,8 +30,10 @@ def up
         require 'fileutils'
         require 'linux_admin'
 
-        LinuxAdmin::FSTab.instance.entries.delete_if { |e| e.mount_point == "/repo" }
-        LinuxAdmin::FSTab.instance.write!
+        if File.exist?("/etc/fstab")
+          LinuxAdmin::FSTab.instance.entries.delete_if { |e| e.mount_point == "/repo" }
+          LinuxAdmin::FSTab.instance.write!
+        end
 
         FileUtils.rm_f("/etc/httpd/conf.d/manageiq-https-mirror.conf")
         FileUtils.rm_f("/etc/yum.repos.d/manageiq-mirror.repo")

spec/migrations/20170512233333_drop_miq_server_rhn_mirror_spec.rb

@@ -1,4 +1,5 @@
 require_migration
+require 'linux_admin'
 
 describe DropMiqServerRhnMirror do
   let(:server_role_stub)     { migration_stub(:ServerRole) }
@@ -43,6 +44,7 @@
       expect(File).to receive(:exist?).with('/var/www/miq/vmdb').and_return(true)
 
       mock_fstab_lines = ["/dev/sda / xfs defaults 0 0", "/dev/sdb /repo xfs defaults 0 0"]
+      expect(File).to receive(:exist?).with("/etc/fstab").and_return(true)
       expect(File).to receive(:read).with("/etc/fstab").and_return(mock_fstab_lines.join("\n"))
       expect(File).to receive(:write).with("/etc/fstab", "/dev/sda     / xfs defaults        0        0 \n")
 
@@ -52,5 +54,19 @@
 
       migrate
     end
+
+    it "doesn't fail if /etc/fstab doesn't exist" do
+      expect(Rails.env).to receive(:production?).and_return(true)
+      expect(File).to receive(:exist?).with('/var/www/miq/vmdb').and_return(true)
+
+      expect(File).to receive(:exist?).with("/etc/fstab").and_return(false)
+      expect(LinuxAdmin::FSTab.instance).not_to receive(:write!)
+
+      expect(FileUtils).to receive(:rm_f).with("/etc/httpd/conf.d/manageiq-https-mirror.conf")
+      expect(FileUtils).to receive(:rm_f).with("/etc/yum.repos.d/manageiq-mirror.repo")
+      expect(FileUtils).to receive(:rm_rf).with([])
+
+      migrate
+    end
   end
 end