foreman_maintain 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0308a81ffbe17ee43deef021d8a3c43864fb886c'
-  data.tar.gz: 6c9b6d939187e1461b991760d507364500046da1
+  metadata.gz: 999cf43419721ea21acfe4f43ed88dde3d41633b
+  data.tar.gz: 1864e1f18ff5c036f25516d52ab7cdcee87b64fc
 SHA512:
-  metadata.gz: 7c75df5e43ecd4f33e2be2bc8b09a809c2931bf7d71657df4964f2d6ffe1ee6c5eb184800f9aa864f3effb524f3ca353dc974323f621c1c1112bd4b174e4697a
-  data.tar.gz: 99795da6683e38730a50c1ba4a286473bd2af075da7ee33a12f4ad045c68d5bc11cbac74fde3056604d3df373a73007e43f20593cfc3911c70f939cc8ea707b3
+  metadata.gz: 17e48dc3ff9981b09d2265e427ebd6dc635e28e75f8f37b9c8d5d43974cc3df90cfdab9b7e585af8def025c06a736fc277d8fe2143ac8b91a8174e6c5c5b8f5d
+  data.tar.gz: 3b5dce2b1b7754e45c509ac032e8cfe3b511c72c51fdcf4d201cc42bb116842144250eef48f7da1b73da3c1e2ec2f238e47cab74d33292976327cf636a7d22a1

data/definitions/features/candlepin_database.rb

@@ -21,7 +21,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
 
   def check_option_using_cpdb_help(option_name, parent_cmd = '')
     parent_cmd = '/usr/share/candlepin/cpdb' if parent_cmd.empty?
-    help_cmd = "#{parent_cmd} --help |  grep -c '\\-\\-#{option_name} '"
+    help_cmd = "#{parent_cmd} --help |  grep -c '\\-\\-#{option_name}'"
     execute?(help_cmd)
   end
 
@@ -31,6 +31,7 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
     main_cmd += format_shell_args(
       '-u' => configuration['username'], '-p' => configuration[%(password)]
     )
+    main_cmd += format_shell_args(extend_with_db_options)
     execute_with_status(main_cmd, :hidden_patterns => [configuration['password']])
   end
 
@@ -45,22 +46,51 @@ class Features::CandlepinDatabase < ForemanMaintain::Feature
 
   private
 
+  # rubocop:disable Metrics/MethodLength
   def load_configuration
     raw_config = File.read(CANDLEPIN_DB_CONFIG)
     full_config = Hash[raw_config.scan(/(^[^#\n][^=]*)=(.*)/)]
     uri_regexp = %r{://(([^/:]*):?([^/]*))/([^?]*)\??(ssl=([^&]*))?}
-    uri = uri_regexp.match(full_config['jpa.config.hibernate.connection.url'])
+    url = full_config['jpa.config.hibernate.connection.url']
+    uri = uri_regexp.match(url)
     @configuration = {
       'username' => full_config['jpa.config.hibernate.connection.username'],
       'password' => full_config['jpa.config.hibernate.connection.password'],
       'database' => uri[4],
       'host' => uri[2],
       'port' => uri[3] || '5432',
-      'ssl' => (uri[6] == 'true'),
+      'ssl' => (fetch_extra_param(url, 'ssl') == 'true'),
+      'sslfactory' => fetch_extra_param(url, 'sslfactory'),
       'driver_class' => full_config['jpa.config.hibernate.connection.driver_class'],
-      'url' => full_config['jpa.config.hibernate.connection.url']
+      'url' => url
     }
   end
+  # rubocop:enable Metrics/MethodLength
+
+  def extend_with_db_options
+    db_options = { '-d' => construct_database_string }
+    if check_option_using_cpdb_help('dbhost')
+      db_options['--dbhost'] = configuration['host']
+      db_options['--dbport'] = configuration['port']
+    end
+    db_options
+  end
+
+  def construct_database_string
+    db_str = configuration['database']
+    extra_opts = []
+    extra_opts << "ssl=#{configuration['ssl']}" if configuration['ssl']
+    extra_opts << "sslfactory=#{configuration['sslfactory']}" if configuration['sslfactory']
+    db_str += "?#{extra_opts.join('&')}" unless extra_opts.empty?
+    db_str
+  end
+
+  def fetch_extra_param(url, key_name)
+    query_string = url.split('?')[1]
+    return nil unless query_string
+    output = /#{key_name}=([^&]*)?/.match(query_string)
+    output[1] if output
+  end
 
   def cpdb_validate_cmd
     return '' unless check_option_using_cpdb_help('validate')

data/definitions/features/service.rb

@@ -35,7 +35,12 @@ class Features::Service < ForemanMaintain::Feature
 
   def existing_services
     service_list = get_services_from_features(available_features)
-    service_list.select { |service| service_exists?(service) }
+    service_list.select { |service| service_remote?(service) || service_exists?(service) }
+  end
+
+  def service_remote?(service)
+    (service == 'postgresql' && !feature(:instance).postgresql_local?) ||
+      (service == 'mongod' && feature(:instance).database_remote?(:mongo))
   end
 
   def filtered_services(options)

data/definitions/scenarios/upgrade_to_satellite_6_4.rb

@@ -21,8 +21,8 @@ module Scenarios::Satellite_6_4
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
+      add_steps(find_checks(:puppet_upgrade_guide))
       add_step(Checks::Repositories::Validate.new(:version => '6.4'))
-      add_step(Checks::Puppet::ProvideUpgradeGuide.new)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_4_z.rb

@@ -22,7 +22,6 @@ module Scenarios::Satellite_6_4_z
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Repositories::Validate.new(:version => '6.4'))
-      add_step(Checks::Puppet::ProvideUpgradeGuide.new)
     end
   end
 

data/lib/foreman_maintain/upgrade_runner.rb

@@ -37,7 +37,7 @@ module ForemanMaintain
       end
 
       def clear_register
-        versions_to_tags.lear
+        versions_to_tags.clear
       end
 
       def current_target_version

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp