manageiq-appliance_console 3.3.3 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1778c8d617691aa881a998d7d106d8062d6f6e1ae21f64286f5cc6e784366eb4
-  data.tar.gz: feed3c1a56f14984c3f062591c6275f4ba687b0c77b3a7a10c9e25b8e4da5c5d
+  metadata.gz: 2ae45795759924ffcb767e88c968847a8ab4668ca7e300bee23862e1b5cbc9be
+  data.tar.gz: 2b681236da45dc65576e2a0779aaa9179ac1f04079f1f2c7982bdb5923b75da0
 SHA512:
-  metadata.gz: 7e3d29649b362700a9d9f94083e51f0531e99efc6aae2fc67af2286692d267e1fb5c9e031c9050e08311f4f207a52098843a0d5fbf7ec0b9451a621a5b2343b1
-  data.tar.gz: 7073df17678575318c597b655ab657d5927d4492bd71eda802df52a6f065b0fd8c57083ddd415a615e9a687f7f3886911f8ed80aed6b72b42ebaba63c45731a1
+  metadata.gz: 2f76a5c46f96ea86a1d31376008ef8692fc1006a7f2082ea5d8815df1415a7974a0a9924592070291661c634d4d8fb156e2296855ebd38bac44ec494ad575d05
+  data.tar.gz: 379e0487991063ecc85c6b24b58d68712d72bb71d7212254775f18a1b7b6d9c2cce3056da46b38c9be12c65e79b26107463236cd688bffb570c4d4707db8e197

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 => "hammer"
+gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending", :branch => "master"

data/lib/manageiq/appliance_console/certificate.rb

@@ -1,4 +1,6 @@
 require "awesome_spawn"
+require "linux_admin"
+require "fileutils"
 
 module ManageIQ
 module ApplianceConsole
@@ -39,8 +41,11 @@ module ApplianceConsole
     end
 
     def request
+      undo_tracking if complete?
+
       if should_request_key?
         principal.register
+        remove_key_pair
         request_certificate
         # NOTE: status probably changed
         set_owner_of_key unless rejected?
@@ -103,8 +108,29 @@ module ApplianceConsole
       @status ||= key_status
     end
 
+    def enable_certmonger
+      say("enabling certmonger to start on reboot")
+      LinuxAdmin::Service.new("certmonger").enable.start
+    end
+
     private
 
+    def remove_key_pair
+      FileUtils.rm_f(cert_filename) if File.exist?(cert_filename)
+      FileUtils.rm_f(key_filename)  if File.exist?(key_filename)
+    end
+
+    def undo_tracking
+      stop_tracking
+      FileUtils.rm_f(root_filename) if File.exist?(root_filename)
+      remove_key_pair
+      clear_status
+    end
+
+    def stop_tracking
+      AwesomeSpawn.run!("/usr/bin/getcert", :params => ["stop-tracking", "-f", cert_filename, "-k", key_filename])
+    end
+
     def request_first
       params = {
         nil  => "request",

data/lib/manageiq/appliance_console/certificate_authority.rb

@@ -63,7 +63,7 @@ module ApplianceConsole
         AwesomeSpawn.run!("/sbin/restorecon -R #{PSQL_CLIENT_DIR}")
       end
 
-      self.pgclient = Certificate.new(
+      cert = Certificate.new(
         :cert_filename => "#{PSQL_CLIENT_DIR}/postgresql.crt",
         :root_filename => "#{PSQL_CLIENT_DIR}/root.crt",
         :service       => "manageiq",
@@ -71,7 +71,12 @@ module ApplianceConsole
         :ca_name       => ca_name,
         :hostname      => hostname,
         :realm         => realm,
-      ).request.status
+      ).request
+
+      if cert.complete?
+        cert.enable_certmonger
+      end
+      self.pgclient = cert.status
     end
 
     def configure_pgserver
@@ -92,6 +97,8 @@ module ApplianceConsole
         # no need for username/password since not writing database.yml
         InternalDatabaseConfiguration.new(:ssl => true).configure_postgres
         LinuxAdmin::Service.new(PostgresAdmin.service_name).restart
+
+        cert.enable_certmonger
       end
       self.pgserver = cert.status
     end
@@ -110,6 +117,8 @@ module ApplianceConsole
       if cert.complete?
         say "configuring apache to use new certs"
         LinuxAdmin::Service.new("httpd").restart
+
+        cert.enable_certmonger
       end
       self.http = cert.status
     end

data/lib/manageiq/appliance_console/cli.rb

@@ -1,4 +1,4 @@
-require 'trollop'
+require 'optimist'
 require 'pathname'
 
 # support for appliance_console methods
@@ -10,8 +10,6 @@ end
 
 module ManageIQ
 module ApplianceConsole
-  class CliError < StandardError; end
-
   class Cli
     attr_accessor :options
 
@@ -108,7 +106,7 @@ module ApplianceConsole
 
     def parse(args)
       args.shift if args.first == "--" # Handle when called through script/runner
-      self.options = Trollop.options(args) do
+      self.options = Optimist.options(args) do
         banner "Usage: appliance_console_cli [options]"
 
         opt :host,     "/etc/hosts name",    :type => :string,  :short => 'H'
@@ -149,7 +147,7 @@ module ApplianceConsole
         opt :extauth_opts,         "External Authentication Options",   :type => :string
         opt :server,               "{start|stop|restart} actions on evmserverd Server",   :type => :string
       end
-      Trollop.die :region, "needed when setting up a local database" if region_number_required? && options[:region].nil?
+      Optimist.die :region, "needed when setting up a local database" if region_number_required? && options[:region].nil?
       self
     end
 
@@ -158,7 +156,7 @@ module ApplianceConsole
     end
 
     def run
-      Trollop.educate unless set_host? || key? || database? || tmp_disk? || log_disk? ||
+      Optimist.educate unless set_host? || key? || database? || tmp_disk? || log_disk? ||
                              uninstall_ipa? || install_ipa? || certs? || extauth_opts? ||
                              time_zone? || date_time? || set_server_state? || set_replication?
       if set_host?
@@ -180,10 +178,6 @@ module ApplianceConsole
       install_certs if certs?
       extauth_opts if extauth_opts?
       set_server_state if set_server_state?
-    rescue CliError => e
-      say(e.message)
-      say("")
-      exit(1)
     rescue AwesomeSpawn::CommandResultError => e
       say e.result.output
       say e.result.error
@@ -222,12 +216,16 @@ module ApplianceConsole
       # initdb, relabel log directory for selinux, update configs,
       # start pg, create user, create db update the rails configuration,
       # verify, set up the database with region. activate does it all!
-      raise CliError, "Failed to configure internal database" unless config.activate
+      unless config.activate
+        say "Failed to configure internal database"
+        return
+      end
 
       # enable/start related services
       config.post_activation
     rescue RuntimeError => e
-      raise CliError, "Failed to configure internal database #{e.message}"
+      say e.message
+      say "Failed to configure internal database"
     end
 
     def set_external_db
@@ -243,7 +241,10 @@ module ApplianceConsole
       }.delete_if { |_n, v| v.nil? })
 
       # call create_or_join_region (depends on region value)
-      raise CliError, "Failed to configure external database" unless config.activate
+      unless config.activate
+        say "Failed to configure external database"
+        return
+      end
 
       # enable/start related services
       config.post_activation

data/lib/manageiq/appliance_console/database_replication.rb

@@ -7,7 +7,7 @@ module ApplianceConsole
   class DatabaseReplication
     include ManageIQ::ApplianceConsole::Logging
 
-    REPMGR_CONFIG     = '/etc/repmgr.conf'.freeze
+    REPMGR_CONFIG     = '/etc/repmgr/10/repmgr.conf'.freeze
     REPMGR_LOG        = '/var/log/repmgr/repmgrd.log'.freeze
     PGPASS_FILE       = '/var/lib/pgsql/.pgpass'.freeze
     NETWORK_INTERFACE = 'eth0'.freeze
@@ -59,7 +59,7 @@ Replication Server Configuration
         node_name=#{host}
         conninfo='host=#{host} user=#{database_user} dbname=#{database_name}'
         use_replication_slots=1
-        pg_basebackup_options='--xlog-method=stream'
+        pg_basebackup_options='--wal-method=stream'
         failover=automatic
         promote_command='repmgr standby promote -f #{REPMGR_CONFIG} --log-to-file'
         follow_command='repmgr standby follow -f #{REPMGR_CONFIG} --log-to-file --upstream-node-id=%n'

data/lib/manageiq/appliance_console/database_replication_standby.rb

@@ -8,7 +8,7 @@ module ApplianceConsole
     include ManageIQ::ApplianceConsole::Logging
 
     REGISTER_CMD    = 'repmgr standby register'.freeze
-    REPMGRD_SERVICE = 'rh-postgresql95-repmgr'.freeze
+    REPMGRD_SERVICE = 'repmgr10'.freeze
 
     attr_accessor :disk, :standby_host, :run_repmgrd_configuration, :resync_data, :force_register
 

data/lib/manageiq/appliance_console/internal_database_configuration.rb

@@ -123,7 +123,7 @@ module ApplianceConsole
     end
 
     def run_initdb
-      AwesomeSpawn.run!("service", :params => {nil => [PostgresAdmin.service_name, "initdb"]})
+      AwesomeSpawn.run!("postgresql-setup", :params => {:initdb => nil, :unit => PostgresAdmin.service_name})
     end
 
     def start_postgres

data/lib/manageiq/appliance_console/logical_volume_management.rb

@@ -34,9 +34,8 @@ module ApplianceConsole
       create_volume_group
       create_logical_volume_to_fill_volume_group
       format_logical_volume
-      update_fstab
-      lazy_unmount_mount_point
       mount_disk
+      update_fstab
     end
 
     private
@@ -70,32 +69,30 @@ 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 => ["-a"])
+      AwesomeSpawn.run!("mount", :params => {"-t" => filesystem_type,
+                                             nil  => [logical_volume.path, mount_point]})
     end
 
     def update_fstab
       fstab = LinuxAdmin::FSTab.instance
-      entry = fstab.entries.find { |e| e.mount_point == mount_point.to_s } || LinuxAdmin::FSTabEntry.new
-      fstab.entries.delete(entry)
+      return if fstab.entries.find { |e| e.mount_point == mount_point }
 
-      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
+      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
+      )
 
       fstab.entries << entry
-      fstab.write!
+      fstab.write! # Test this more, whitespace is removed
     end
   end
 end

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '3.3.3'.freeze
+    VERSION = '4.0.0'.freeze
   end
 end

data/manageiq-appliance_console.gemspec

@@ -26,9 +26,9 @@ 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.4"]
+  spec.add_runtime_dependency "linux_admin",             ["~> 1.0", ">=1.2.2"]
+  spec.add_runtime_dependency "optimist",                "~> 3.0"
   spec.add_runtime_dependency "pg"
-  spec.add_runtime_dependency "trollop",                 "~> 2.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 4.0.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-19 00:00:00.000000000 Z
+date: 2019-03-12 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.4
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,35 +113,35 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +301,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ManageIQ Appliance Console