manageiq-appliance_console 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5db0f0a200a6f3e1875eb8b7545ae1489f7eea32fe2c4d8d649eefdd29d8a3fe
-  data.tar.gz: a7300234642869da3c81a4dc83ed5f12d7a6978807adbc01f0efea04898d2a75
+  metadata.gz: 03acccd11ea06ed06a200676e668a38951e56cdd2d65a2cfdfff7f7f8c54744b
+  data.tar.gz: 3da4c72c3a719f016fca4aced7062b9c1efd3d88a5662b2a1807f3670843f4ec
 SHA512:
-  metadata.gz: abbe0a3d8746474b4f38663ad01bb2dfec45c8f8f8c02084ac63230c808985584c8bdcf37d04df9aa45d09ec4df8c7e75db68e94b739f2a7d2bedbf5989df6d8
-  data.tar.gz: 0a0bad5e8ad7e3dd1c07a5d895fa118d10ad6834ac17be6518f8af1c0bf3fc6b1be3c9f728905df1a43e33d22316ed9cf1affbef138d37667cbadd8cbcbc3790
+  metadata.gz: faf9223abdcd01b9615d91cfe79f981adc492c208716e20dc6aea92f7a0bc6547468019502f62f8be8735f40bb2f35e2c4a3bca13061a2b5e403989daed15bf8
+  data.tar.gz: f2e1f78fd2d49a821d77560a197b2ae83d7c65504d64ca2b6fa137143afe856a27302332587dcbebd8e4a3e4714ab19624e95e4f2fffd3f0d48551ed6818e617

data/bin/appliance_console

@@ -394,6 +394,14 @@ Static Network Configuration
         task_params = []
         uri = nil
 
+        connections = ManageIQ::ApplianceConsole::Utilities.db_connections - 1
+        if connections > 0
+          say("\nDatabase restore failed")
+          say("\nThere #{connections > 1 ? "are #{connections} connections" : "is 1 connection"} preventing a database restore")
+          press_any_key
+          raise MiqSignalError
+        end
+
         # TODO: merge into 1 prompt
         case ask_with_menu("Restore Database File", RESTORE_OPTIONS, RESTORE_LOCAL, nil)
         when RESTORE_LOCAL
@@ -435,10 +443,6 @@ Static Network Configuration
           if rake_success && delete_agreed
             say("\nRemoving the database restore file #{DB_RESTORE_FILE}...")
             File.delete(DB_RESTORE_FILE)
-          elsif !rake_success
-            say("\nDatabase restore failed")
-            connections = ManageIQ::ApplianceConsole::Utilities.db_connections - 1
-            say("\nThere #{connections > 1 ? "are #{connections} connections" : "is 1 connection"} preventing a database restore") if connections > 0
           end
         end
         press_any_key

data/lib/manageiq/appliance_console/cli.rb

@@ -67,6 +67,10 @@ module ApplianceConsole
       options[:timezone]
     end
 
+    def date_time?
+      options[:datetime]
+    end
+
     def extauth_opts?
       options[:extauth_opts]
     end
@@ -141,11 +145,12 @@ module ApplianceConsole
         opt :iparealm,      "IPA Server realm (optional)", :type => :string
         opt :ca,                   "CA name used for certmonger",       :type => :string,  :default => "ipa"
         opt :timezone,             "Time zone",                         :type => :string
+        opt :datetime,             "Date and time, in YYYY-MM-DDTHH:MM:SS (ISO8601) format", :type => :string
         opt :postgres_client_cert, "install certs for postgres client", :type => :boolean
         opt :postgres_server_cert, "install certs for postgres server", :type => :boolean
         opt :http_cert,            "install certs for http server",     :type => :boolean
         opt :extauth_opts,         "External Authentication Options",   :type => :string
-        opt :server,               "Server status",                     :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?
       self
@@ -158,8 +163,8 @@ module ApplianceConsole
     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? ||
-                             set_replication?
+                             time_zone? || date_time? || set_server_state? ||
+                             db_hourly_maintenance? || set_replication?
       if set_host?
         system_hosts = LinuxAdmin::Hosts.new
         system_hosts.hostname = options[:host]
@@ -171,6 +176,7 @@ module ApplianceConsole
       set_db if database?
       set_replication if set_replication?
       set_time_zone if time_zone?
+      set_date_time if date_time?
       config_db_hourly_maintenance if db_hourly_maintenance?
       config_tmp_disk if tmp_disk?
       config_log_disk if log_disk?
@@ -280,6 +286,26 @@ module ApplianceConsole
       end
     end
 
+    def set_date_time
+      date_time_config = ManageIQ::ApplianceConsole::DateTimeConfiguration.new
+      unless options[:datetime] == "auto"
+        date_time_config.manual_time_sync = true
+        date_time_config.new_date, date_time_config.new_time = options[:datetime].split("T")
+        return unless date_time_valid?(date_time_config)
+      end
+      date_time_config.activate
+    end
+
+    def date_time_valid?(date_time_config)
+      unless ManageIQ::ApplianceConsole::DateTimeConfiguration::DATE_REGEXP =~ date_time_config.new_date &&
+             ManageIQ::ApplianceConsole::DateTimeConfiguration::TIME_REGEXP =~ date_time_config.new_time
+        say("Datetime should be given in YYYY-MM-DDTHH:MM:SS format")
+        say("Datetime not configured")
+        return false
+      end
+      true
+    end
+
     def key_configuration
       @key_configuration ||= KeyConfiguration.new(
         :action   => options[:fetch_key] ? :fetch : :create,

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '1.2.3'.freeze
+    VERSION = '1.2.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord