manageiq-appliance_console 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b10986b5028473a3dc2c76b61a64e76ce3516a66
-  data.tar.gz: b6da7fa0e0418a9de8e7cbdef7c2360cc6e5a693
+SHA256:
+  metadata.gz: ab0a7cbd85921dd1332fbaa9b01329e3bc2a5197be9e12ea928f9737ee499003
+  data.tar.gz: 9a8fd3d5d58239eec4c21ce7efb4ecb2546215b7e0f66ec2a14c2f6fe81e66b6
 SHA512:
-  metadata.gz: e77ae3abc9a699233df891bd03d21c69556f74f859530d62d01920d83334500a0244299e4b18dcc74f6dbb288c9f56b803d1859a46b776ba00e43485a118bbdb
-  data.tar.gz: b7f905b13233cfeaaf3fbb77128f7253a96374777d896f48d6a6774041080d507317685209ab51fee860f142ba0df7ddad3218b13ce6035425ddbe98786b26a5
+  metadata.gz: ed57328bff42362e4a51920baa3268ed3a2d8d6e16a8b0da493eec419c65e05763ba820a0e195b61279bc521f4c012d0a5246fb9ebeacc5354543d89136eb8bd
+  data.tar.gz: 80e710fa562abca7f2a935b9828ebc91841730f9eac789214a35bc64439e011b07918cfea629649d11519eee676bd6264b404e6762b7ce3d6bbbaf94d372f824

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- '2.3.5'
+- '2.3.1'
 - '2.4.2'
 sudo: false
 cache: bundler

data/bin/appliance_console

@@ -173,7 +173,7 @@ To modify the configuration, use a web browser to access the management page.
           new_mask = ask_for_ipv4("Netmask", mask)
           new_gw   = ask_for_ipv4("Gateway", gw)
           new_dns1 = ask_for_ipv4("Primary DNS", dns1)
-          new_dns2 = ask_for_ipv4_or_none("Secondary DNS (Enter 'none' for no value)")
+          new_dns2 = ask_for_ipv4_or_none("Secondary DNS (Enter 'none' for no value)", dns2)
 
           new_search_order = ask_for_many("domain", "Domain search order", order)
 
@@ -225,7 +225,7 @@ Static Network Configuration
           new_prefix = ask_for_integer('IPv6 prefix length', 1..127, eth0.prefix6 || 64)
           new_gw = ask_for_ipv6('Default gateway', eth0.gateway6)
           new_dns1 = ask_for_ip('Primary DNS', dns1)
-          new_dns2 = ask_for_ipv6_or_none("Secondary DNS (Enter 'none' for no value)")
+          new_dns2 = ask_for_ipv6_or_none("Secondary DNS (Enter 'none' for no value)", dns2)
 
           new_search_order = ask_for_many('domain', 'Domain search order', order)
 

data/lib/manageiq-appliance_console.rb

@@ -24,6 +24,7 @@ require 'manageiq/appliance_console/logger'
 require 'manageiq/appliance_console/logging'
 
 require 'manageiq-gems-pending'
+require 'highline'
 
 require 'manageiq/appliance_console/certificate'
 require 'manageiq/appliance_console/certificate_authority'

data/lib/manageiq/appliance_console/cli.rb

@@ -36,11 +36,11 @@ module ApplianceConsole
     end
 
     def database?
-      hostname
+      options[:standalone] || hostname
     end
 
     def local_database?
-      database? && local?(hostname)
+      database? && (local?(hostname) || options[:standalone])
     end
 
     def certs?
@@ -79,6 +79,14 @@ module ApplianceConsole
       options[:db_hourly_maintenance]
     end
 
+    def set_replication?
+      options[:cluster_node_number] && options[:password] && replication_params?
+    end
+
+    def replication_params?
+      options[:replication] == "primary" || (options[:replication] == "standby" && options[:primary_host])
+    end
+
     def initialize(options = {})
       self.options = options
     end
@@ -116,6 +124,11 @@ module ApplianceConsole
         opt :force_key, "Forcefully create encryption key", :type => :boolean, :short => "f"
         opt :sshlogin,  "SSH login",         :type => :string,                 :default => "root"
         opt :sshpassword, "SSH password",    :type => :string
+        opt :replication, "Configure database replication as primary or standby", :type => :string, :short => :none
+        opt :primary_host, "Primary database host IP address", :type => :string, :short => :none
+        opt :standby_host, "Standby database host IP address", :type => :string, :short => :none
+        opt :auto_failover, "Configure Replication Manager (repmgrd) for automatic failover", :type => :bool, :short => :none
+        opt :cluster_node_number, "Database unique cluster node number", :type => :integer, :short => :none
         opt :verbose,  "Verbose",            :type => :boolean, :short => "v"
         opt :dbdisk,   "Database Disk Path", :type => :string
         opt :logdisk,  "Log Disk Path",      :type => :string
@@ -134,14 +147,19 @@ module ApplianceConsole
         opt :extauth_opts,         "External Authentication Options",   :type => :string
         opt :server,               "Server status",                     :type => :string
       end
-      Trollop.die :region, "needed when setting up a local database" if options[:region].nil? && local_database?
+      Trollop.die :region, "needed when setting up a local database" if region_number_required? && options[:region].nil?
       self
     end
 
+    def region_number_required?
+      !options[:standalone] && local_database?
+    end
+
     def run
       Trollop.educate unless set_host? || key? || database? || tmp_disk? || log_disk? ||
                              uninstall_ipa? || install_ipa? || certs? || extauth_opts? ||
-                             time_zone? || set_server_state? || db_hourly_maintenance?
+                             time_zone? || set_server_state? || db_hourly_maintenance? ||
+                             set_replication?
       if set_host?
         system_hosts = LinuxAdmin::Hosts.new
         system_hosts.hostname = options[:host]
@@ -151,6 +169,7 @@ module ApplianceConsole
       end
       create_key if key?
       set_db if database?
+      set_replication if set_replication?
       set_time_zone if time_zone?
       config_db_hourly_maintenance if db_hourly_maintenance?
       config_tmp_disk if tmp_disk?
@@ -232,8 +251,28 @@ module ApplianceConsole
       config.post_activation
     end
 
+    def set_replication
+      if options[:replication] == "primary"
+        db_replication = ManageIQ::ApplianceConsole::DatabaseReplicationPrimary.new
+        say("Configuring Server as Primary")
+      else
+        db_replication = ManageIQ::ApplianceConsole::DatabaseReplicationStandby.new
+        say("Configuring Server as Standby")
+        db_replication.disk = disk_from_string(options[:dbdisk])
+        db_replication.primary_host = options[:primary_host]
+        db_replication.standby_host = options[:standby_host] if options[:standby_host]
+        db_replication.run_repmgrd_configuration = options[:auto_failover] ? true : false
+      end
+      db_replication.database_name = options[:dbname] if options[:dbname]
+      db_replication.database_user = options[:username] if options[:username]
+      db_replication.node_number = options[:cluster_node_number]
+      db_replication.database_password = options[:password]
+      db_replication.activate
+    end
+
     def set_time_zone
       timezone_config = ManageIQ::ApplianceConsole::TimezoneConfiguration.new(options[:timezone])
+      timezone_config.new_timezone = options[:timezone]
       if timezone_config.activate
         say("Timezone configured")
       else
@@ -254,7 +293,8 @@ module ApplianceConsole
     def create_key
       say "#{key_configuration.action} encryption key"
       unless key_configuration.activate
-        raise "Could not create encryption key (v2_key)"
+        say("Could not create encryption key (v2_key)")
+        exit(1)
       end
     end
 

data/lib/manageiq/appliance_console/database_configuration.rb

@@ -80,7 +80,8 @@ module ApplianceConsole
     end
 
     def create_region
-      ManageIQ::ApplianceConsole::Utilities.bail_if_db_connections("preventing the setup of a database region")
+      hint = "Please stop the EVM server process on all appliances in the region"
+      ManageIQ::ApplianceConsole::Utilities.bail_if_db_connections("preventing the setup of a database region.\n#{hint}")
       log_and_feedback(__method__) do
         ManageIQ::ApplianceConsole::Utilities.rake("evm:db:region", ["--", {:region => region}])
       end

data/lib/manageiq/appliance_console/database_replication.rb

@@ -6,9 +6,10 @@ module ApplianceConsole
   class DatabaseReplication
     include ManageIQ::ApplianceConsole::Logging
 
-    REPMGR_CONFIG = '/etc/repmgr.conf'.freeze
-    REPMGR_LOG    = '/var/log/repmgr/repmgrd.log'.freeze
-    PGPASS_FILE   = '/var/lib/pgsql/.pgpass'.freeze
+    REPMGR_CONFIG     = '/etc/repmgr.conf'.freeze
+    REPMGR_LOG        = '/var/log/repmgr/repmgrd.log'.freeze
+    PGPASS_FILE       = '/var/lib/pgsql/.pgpass'.freeze
+    NETWORK_INTERFACE = 'eth0'.freeze
 
     attr_accessor :cluster_name, :node_number, :database_name, :database_user,
                   :database_password, :primary_host
@@ -71,7 +72,7 @@ Replication Server Configuration
         primary_region_number =
           pg_conn.exec("SELECT last_value FROM miq_databases_id_seq").first["last_value"].to_i / 1_000_000_000_000
         self.cluster_name = "miq_region_#{primary_region_number}_cluster"
-      rescue PG::ConnectionBad => e
+      rescue PG::ConnectionBad, PG::UndefinedTable => e
         say("Failed to get primary region number #{e.message}")
         logger.error("Failed to get primary region number #{e.message}")
         return false

data/lib/manageiq/appliance_console/internal_database_configuration.rb

@@ -65,11 +65,11 @@ module ApplianceConsole
     end
 
     def choose_disk
-      @disk = ask_for_disk("database disk")
+      @disk = ask_for_disk("database disk", false, true)
     end
 
     def check_disk_is_mount_point
-      error_message = "The disk for database must be a mount point"
+      error_message = "Internal databases require a volume mounted at #{mount_point}. Please add an unpartitioned disk and try again."
       raise error_message unless disk || pg_mount_point?
     end
 

data/lib/manageiq/appliance_console/prompts.rb

@@ -144,12 +144,12 @@ module ApplianceConsole
       just_ask(prompt, default, INT_REGEXP, "an integer", Integer) { |q| q.in = range if range }
     end
 
-    def ask_for_disk(disk_name, verify = true)
+    def ask_for_disk(disk_name, verify = true, silent = false)
       require "linux_admin"
       disks = LinuxAdmin::Disk.local.select { |d| d.partitions.empty? }
 
       if disks.empty?
-        say "No partition found for #{disk_name}. You probably want to add an unpartitioned disk and try again."
+        say("No partition found for #{disk_name}. You probably want to add an unpartitioned disk and try again.") unless silent
       else
         default_choice = disks.size == 1 ? "1" : nil
         disk = ask_with_menu(
@@ -160,9 +160,8 @@ module ApplianceConsole
           q.choice("Don't partition the disk") { nil }
         end
       end
-
       if verify && disk.nil?
-        say ""
+        say("")
         raise MiqSignalError unless are_you_sure?(" you don't want to partition the #{disk_name}")
       end
       disk

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/manageiq-appliance_console.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord"
-  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "activerecord",            ">= 4.2.2"
+  spec.add_runtime_dependency "activesupport",           ">= 4.2.2"
   spec.add_runtime_dependency "awesome_spawn",           "~> 1.4"
   spec.add_runtime_dependency "bcrypt",                  "~> 3.1.10"
   spec.add_runtime_dependency "highline",                "~> 1.6.21"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: awesome_spawn
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: ManageIQ Appliance Console