foreman_maintain 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 82c1f6b6412effc3fdbc0c76d5940141c6bcedbe8a24f2201297c586464ee26b
-  data.tar.gz: 88e0dc3579e6a1dee0e371f13aa594e76bcfc871f1914430888b86db21e86b37
+SHA1:
+  metadata.gz: 8b3244cbf0c35c7e4794fcca31be180489bacdab
+  data.tar.gz: 2c31ba26f1d8880ddd6b555415a309623f1bc19c
 SHA512:
-  metadata.gz: d9ea4129e24dd5864586da1e5dcec6354a60090e03e95ff9a9f73a98b10a6ba7c60285f50a97ca2b7ee8faaac322a02c8c2064db635b3dc464c9cd4e7e5d1e2c
-  data.tar.gz: 67945a1cf054e940949777713d97cd82902516a6fd898a8ae50e4f931589642f2498c2c42da2b2e4f6be60fbfc0613f6b34176d19aa945b7ba4af253e6f10aaf
+  metadata.gz: 97f28a046f0dc4fcc72f40147221547abacde3eab40b8cdc175b3b027000f7028f6f65010c3673033ca2dc2866945e000cde1b72e2b007c1c6340d22f18da786
+  data.tar.gz: b4779ec4433cb5a98985b00d5037af229ad8b7c9774c6ded70ca9461ddc1e8f7e7fc269ee40953aa6cf4cc4c1b976dfa1a072dbc1030423397337cc1ab070f80

data/definitions/features/foreman_proxy.rb

@@ -33,7 +33,14 @@ class Features::ForemanProxy < ForemanMaintain::Feature
 
   def features
     # TODO: handle failures
-    run_curl_cmd("#{curl_cmd}/features").result
+    @features ||= run_curl_cmd("#{curl_cmd}/features").result
+    @features = [] if @features.is_a?(String)
+    @features
+  end
+
+  def refresh_features
+    @features = nil
+    features
   end
 
   def internal?

data/definitions/procedures/foreman_proxy/features.rb

@@ -0,0 +1,14 @@
+module Procedures::ForemanProxy
+  class Features < ForemanMaintain::Procedure
+    metadata do
+      param :load_only, 'Do not print the features', :default => false
+      description 'Detect features available in the local proxy'
+      for_feature :foreman_proxy
+    end
+
+    def run
+      features = feature(:foreman_proxy).refresh_features
+      puts features.join(', ') unless @load_only
+    end
+  end
+end

data/definitions/scenarios/backup.rb

@@ -126,6 +126,7 @@ module ForemanMaintain::Scenarios
 
     def add_offline_backup_steps
       include_dumps if include_db_dumps?
+      add_step_with_context(Procedures::ForemanProxy::Features, :load_only => true)
       add_steps_with_context(
         find_procedures(:maintenance_mode_on),
         Procedures::Service::Stop,
@@ -156,6 +157,8 @@ module ForemanMaintain::Scenarios
 
     # rubocop:disable  Metrics/MethodLength
     def add_snapshot_backup_steps
+      include_dumps if include_db_dumps?
+      add_step_with_context(Procedures::ForemanProxy::Features, :load_only => true)
       add_steps_with_context(
         Procedures::Backup::Snapshot::PrepareMount,
         find_procedures(:maintenance_mode_on),

data/definitions/scenarios/upgrade_to_satellite_6_6_z.rb

@@ -0,0 +1,80 @@
+module Scenarios::Satellite_6_6_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_to_satellite_6_6_z
+        confine do
+          feature(:downstream) && feature(:downstream).current_minor_version == '6.6'
+        end
+        instance_eval(&block)
+      end
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.6.z'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.6'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.6.z'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.6.z'
+      tags :migrations
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.6'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Installer::Upgrade.new)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.6.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.6.z'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end
+
+ForemanMaintain::UpgradeRunner.register_version('6.6.z', :upgrade_to_satellite_6_6_z)

data/lib/foreman_maintain/cli/backup_command.rb

@@ -130,6 +130,7 @@ module ForemanMaintain
       include BackupCommon
       interactive_option
       common_backup_options
+      option '--include-db-dumps', :flag, 'Also dump full database schema before snapshot backup'
       option ['-d', '--snapshot-mount-dir'], 'SNAPSHOT_MOUNT_DIR',
              "Override default directory ('/var/snap/') where the snapshots will be mounted",
              :default => '/var/snap/' do |dir|
@@ -144,7 +145,8 @@ module ForemanMaintain
       def execute
         perform_backup(:snapshot,
                        :snapshot_mount_dir => snapshot_mount_dir,
-                       :snapshot_block_size => snapshot_block_size)
+                       :snapshot_block_size => snapshot_block_size,
+                       :include_db_dumps => include_db_dumps?)
       end
     end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 11.0.0
 description: Provides various features that helps keeping the Foreman/Satellite up
@@ -209,6 +209,7 @@ files:
 - definitions/procedures/foreman/fix_corrupted_roles.rb
 - definitions/procedures/foreman_docker/remove_foreman_docker.rb
 - definitions/procedures/foreman_openscap/invalid_report_associations.rb
+- definitions/procedures/foreman_proxy/features.rb
 - definitions/procedures/foreman_tasks/delete.rb
 - definitions/procedures/foreman_tasks/fetch_tasks_status.rb
 - definitions/procedures/foreman_tasks/resume.rb
@@ -267,6 +268,7 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_5.rb
 - definitions/scenarios/upgrade_to_satellite_6_5_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_6.rb
+- definitions/scenarios/upgrade_to_satellite_6_6_z.rb
 - definitions/scenarios/version_locking.rb
 - lib/foreman_maintain.rb
 - lib/foreman_maintain/check.rb
@@ -350,17 +352,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt