manageiq-appliance_console 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842d9e3f4effbab338ffca56f0d10023b54089078d8a35f51e1af7c34a17f7cd
-  data.tar.gz: fa3019d794de206d44b82fb70f5afbfd6eb28a165c45344957b6bcf4cc6b3b36
+  metadata.gz: 9aab719558452873f17db2eb66a1aeebd73d6e3f23eb41cc00955325e3004907
+  data.tar.gz: 515bf0fc47ceecd4441b0599a198ac81194056f5fc936102cd65d6d0ea31023f
 SHA512:
-  metadata.gz: 32782c59824479eea39097a7adf542b0654ac77a02342e6b398113abbd76426ff5fb0908b5c4eccfeffca22b829b16862322357f286288a41fbf4f1c06fb3335
-  data.tar.gz: 2e9fcbc67a7ad8baff5cbcdba421bfc6c6ba99706a97b53d4a1c4137f606178cb0d74ac5d295c99c9de00478c65b208ef6cf23fa416c2e99dba12d73c79859e9
+  metadata.gz: a4ea565696b02cef54acac874cc8e3260e8a7b3795e68d4f99cd5c59d3c0b1affe230c75739e05e306693aba7de17faf20721db40e533a442baca1832d91dadc
+  data.tar.gz: 9fe682258cd1cefd700ce0ace41d61dce0060dcb4097c63d1a539e180ea8a65f7c7559e2853525ebe342631b9c607ddceab937755b409bba89a790581f8e9855

data/bin/appliance_console

@@ -296,30 +296,6 @@ Static Network Configuration
           end
         end
 
-      when I18n.t("advanced_settings.timezone")
-        say("#{selection}\n\n")
-        timezone_config = ManageIQ::ApplianceConsole::TimezoneConfiguration.new(timezone)
-        if timezone_config.ask_questions && timezone_config.activate
-          say("Timezone configured")
-          press_any_key
-        else
-          say("Timezone not configured")
-          press_any_key
-          raise MiqSignalError
-        end
-
-      when I18n.t("advanced_settings.datetime")
-        say("#{selection}\n\n")
-        date_time_config = ManageIQ::ApplianceConsole::DateTimeConfiguration.new
-        if date_time_config.ask_questions && date_time_config.activate
-          say("Date and time configured")
-          press_any_key
-        else
-          say("Date and time not configured")
-          press_any_key
-          raise MiqSignalError
-        end
-
       when I18n.t("advanced_settings.httpdauth")
         say("#{selection}\n\n")
 

data/lib/manageiq-appliance_console.rb

@@ -27,6 +27,7 @@ require 'manageiq/appliance_console/prompts'
 require 'manageiq-gems-pending'
 require 'highline'
 
+require 'manageiq/appliance_console/auth_utilities'
 require 'manageiq/appliance_console/certificate'
 require 'manageiq/appliance_console/certificate_authority'
 require 'manageiq/appliance_console/cli'
@@ -35,7 +36,6 @@ require 'manageiq/appliance_console/database_configuration'
 require 'manageiq/appliance_console/database_replication'
 require 'manageiq/appliance_console/database_replication_primary'
 require 'manageiq/appliance_console/database_replication_standby'
-require 'manageiq/appliance_console/date_time_configuration'
 require 'manageiq/appliance_console/external_auth_options'
 require 'manageiq/appliance_console/external_database_configuration'
 require 'manageiq/appliance_console/external_httpd_authentication'
@@ -43,9 +43,9 @@ require 'manageiq/appliance_console/internal_database_configuration'
 require 'manageiq/appliance_console/key_configuration'
 require 'manageiq/appliance_console/logfile_configuration'
 require 'manageiq/appliance_console/logical_volume_management'
+require 'manageiq/appliance_console/oidc_authentication'
 require 'manageiq/appliance_console/principal'
 require 'manageiq/appliance_console/saml_authentication'
 require 'manageiq/appliance_console/scap'
 require 'manageiq/appliance_console/temp_storage_configuration'
-require 'manageiq/appliance_console/timezone_configuration'
 require 'manageiq/appliance_console/utilities'

data/lib/manageiq/appliance_console/auth_utilities.rb

@@ -0,0 +1,86 @@
+require "uri"
+require "erb"
+
+module ManageIQ
+  module ApplianceConsole
+    module AuthUtilities
+      HTTPD_CONFIG_DIRECTORY = Pathname.new("/etc/httpd/conf.d")
+
+      def restart_httpd
+        httpd_service = LinuxAdmin::Service.new("httpd")
+        if httpd_service.running?
+          say("Restarting httpd ...")
+          httpd_service.restart
+        end
+      end
+
+      def path_is_file?(path)
+        path.present? && !path_is_url?(path)
+      end
+
+      def path_is_url?(path)
+        path =~ /\A#{URI.regexp(["http", "https"])}\z/x
+      end
+
+      # File Management
+
+      def remove_file(path)
+        if path.exist?
+          debug_msg("Removing #{path} ...")
+          path.delete
+        end
+      end
+
+      def copy_template(dir, file, template_parameters = nil)
+        src_path = template_directory.join(relative_from_root(dir), file)
+        dest_path = dir.join(file)
+        dest_path = dest_path.sub_ext('') if src_path.extname == ".erb"
+        debug_msg("Copying template #{src_path} to #{dest_path} ...")
+        if src_path.extname == ".erb"
+          raise ArgumentError, "Must specify template parameters for ERB files" if template_parameters.nil?
+
+          template = ERB.new(File.read(src_path), nil, '-')
+          File.write(dest_path, template.result_with_hash(template_parameters))
+        else
+          FileUtils.cp(src_path, dest_path)
+        end
+      end
+
+      def template_directory
+        @template_directory ||= Pathname.new(ENV.fetch("APPLIANCE_TEMPLATE_DIRECTORY"))
+      end
+
+      def relative_from_root(path)
+        path.absolute? ? path.relative_path_from(Pathname.new("/")) : path
+      end
+
+      # Appliance Settings
+
+      def configure_auth_settings_database
+        say("Setting Appliance Authentication Settings to Database ...")
+        configure_auth_settings(:mode          => "database",
+                                :httpd_role    => false,
+                                :saml_enabled  => false,
+                                :oidc_enabled  => false,
+                                :sso_enabled   => false,
+                                :provider_type => "none")
+      end
+
+      def configure_auth_settings(args)
+        Utilities.rake_run("evm:settings:set", args.collect { |key, val| "/authentication/#{key}=#{val}" })
+      end
+
+      # Logging
+
+      def debug_msg(msg)
+        say(msg) if options[:verbose]
+      end
+
+      def log_command_error(err)
+        say(err.result.output)
+        say(err.result.error)
+        say("")
+      end
+    end
+  end
+end

data/lib/manageiq/appliance_console/cli.rb

@@ -65,14 +65,6 @@ module ApplianceConsole
       options[:logdisk]
     end
 
-    def time_zone?
-      options[:timezone]
-    end
-
-    def date_time?
-      options[:datetime]
-    end
-
     def extauth_opts?
       options[:extauth_opts]
     end
@@ -85,6 +77,14 @@ module ApplianceConsole
       options[:saml_unconfig]
     end
 
+    def oidc_config?
+      options[:oidc_config]
+    end
+
+    def oidc_unconfig?
+      options[:oidc_unconfig]
+    end
+
     def set_server_state?
       options[:server]
     end
@@ -149,8 +149,6 @@ module ApplianceConsole
         opt :ipadomain,     "IPA Server domain (optional)", :type => :string
         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 :http_cert,            "install certs for http server",     :type => :boolean
         opt :extauth_opts,         "External Authentication Options",   :type => :string
         opt :saml_config,          "Configure Appliance for SAML Authentication",        :type => :boolean, :default => false
@@ -158,6 +156,13 @@ module ApplianceConsole
         opt :saml_idp_metadata,    "The file path or URL of the SAML IDP Metadata",      :type => :string
         opt :saml_enable_sso,      "Optionally enable SSO with SAML Authentication",     :type => :boolean, :default => false
         opt :saml_unconfig,        "Unconfigure Appliance SAML Authentication",          :type => :boolean, :default => false
+        opt :oidc_config,          "Configure Appliance for OpenID-Connect Authentication",          :type => :boolean, :default => false
+        opt :oidc_url,             "The OpenID-Connect Provider URL",                                :type => :string
+        opt :oidc_client_host,     "Optional Appliance host used for OpenID-Connect Authentication", :type => :string
+        opt :oidc_client_id,       "The OpenID-Connect Provider Client ID",                          :type => :string
+        opt :oidc_client_secret,   "The OpenID-Connect Provider Client Secret",                      :type => :string
+        opt :oidc_enable_sso,      "Optionally enable SSO with OpenID-Connect Authentication",       :type => :boolean, :default => false
+        opt :oidc_unconfig,        "Unconfigure Appliance OpenID-Connect Authentication",            :type => :boolean, :default => false
         opt :server,               "{start|stop|restart} actions on evmserverd Server",   :type => :string
       end
       Optimist.die :region, "needed when setting up a local database" if region_number_required? && options[:region].nil?
@@ -171,8 +176,9 @@ module ApplianceConsole
     def run
       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? ||
-                              saml_config? || saml_unconfig?
+                              set_server_state? || set_replication? ||
+                              saml_config? || saml_unconfig? ||
+                              oidc_config? || oidc_unconfig?
       if set_host?
         system_hosts = LinuxAdmin::Hosts.new
         system_hosts.hostname = options[:host]
@@ -183,8 +189,6 @@ module ApplianceConsole
       create_key if key?
       set_db if database?
       set_replication if set_replication?
-      set_time_zone if time_zone?
-      set_date_time if date_time?
       config_tmp_disk if tmp_disk?
       config_log_disk if log_disk?
       uninstall_ipa if uninstall_ipa?
@@ -193,6 +197,8 @@ module ApplianceConsole
       extauth_opts if extauth_opts?
       saml_config if saml_config?
       saml_unconfig if saml_unconfig?
+      oidc_config if oidc_config?
+      oidc_unconfig if oidc_unconfig?
       set_server_state if set_server_state?
     rescue CliError => e
       say(e.message)
@@ -282,36 +288,6 @@ module ApplianceConsole
       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
-        say("Timezone not configured")
-      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,
@@ -412,6 +388,14 @@ module ApplianceConsole
       SamlAuthentication.new(options).unconfigure
     end
 
+    def oidc_config
+      OIDCAuthentication.new(options).configure(options[:oidc_client_host] || host)
+    end
+
+    def oidc_unconfig
+      OIDCAuthentication.new(options).unconfigure
+    end
+
     def set_server_state
       service = LinuxAdmin::Service.new("evmserverd")
       service_running = service.running?

data/lib/manageiq/appliance_console/oidc_authentication.rb

@@ -0,0 +1,92 @@
+module ManageIQ
+  module ApplianceConsole
+    class OIDCAuthentication
+      include ManageIQ::ApplianceConsole::AuthUtilities
+
+      attr_accessor :host, :options
+
+      def initialize(options)
+        @options = options
+      end
+
+      def configure(host)
+        @host = host
+        validate_oidc_options
+
+        say("Configuring OpenID-Connect Authentication for https://#{host} ...")
+        copy_apache_oidc_configfiles
+        configure_auth_settings_oidc
+        restart_httpd
+        true
+      rescue AwesomeSpawn::CommandResultError => e
+        log_command_error(e)
+        say("Failed to Configure OpenID-Connect Authentication - #{e}")
+        false
+      rescue => e
+        say("Failed to Configure OpenID-Connect Authentication - #{e}")
+        false
+      end
+
+      def unconfigure
+        raise "Appliance is not currently configured for OpenID-Connect" unless configured?
+
+        say("Unconfiguring OpenID-Connect Authentication ...")
+        remove_apache_oidc_configfiles
+        configure_auth_settings_database
+        restart_httpd
+        true
+      rescue AwesomeSpawn::CommandResultError => e
+        log_command_error(e)
+        say("Failed to Unconfigure OpenID-Connect Authentication - #{e}")
+        false
+      rescue => e
+        say("Failed to Unconfigure OpenID-Connect Authentication - #{e}")
+        false
+      end
+
+      private
+
+      # Apache OpenID-Connect Configuration
+
+      def copy_apache_oidc_configfiles
+        debug_msg("Copying Apache OpenID-Connect Config files ...")
+        copy_template(HTTPD_CONFIG_DIRECTORY, "manageiq-remote-user-openidc.conf")
+        copy_template(HTTPD_CONFIG_DIRECTORY, "manageiq-external-auth-openidc.conf.erb",
+                      :miq_appliance              => host,
+                      :oidc_provider_metadata_url => options[:oidc_url],
+                      :oidc_client_id             => options[:oidc_client_id],
+                      :oidc_client_secret         => options[:oidc_client_secret])
+      end
+
+      def remove_apache_oidc_configfiles
+        debug_msg("Removing Apache OpenID-Connect Config files ...")
+        remove_file(HTTPD_CONFIG_DIRECTORY.join("manageiq-remote-user-openidc.conf"))
+        remove_file(HTTPD_CONFIG_DIRECTORY.join("manageiq-external-auth-openidc.conf"))
+      end
+
+      def configured?
+        HTTPD_CONFIG_DIRECTORY.join("manageiq-external-auth-openidc.conf").exist?
+      end
+
+      # OpenID-Connect IDP Metadata
+
+      def validate_oidc_options
+        raise "Must specify the OpenID-Connect Provider URL via --oidc-url" if options[:oidc_url].blank?
+        raise "Must specify the OpenID-Connect Client ID via --oidc-client-id" if options[:oidc_client_id].blank?
+        raise "Must specify the OpenID-Connect Client Secret via --oidc-client-secret" if options[:oidc_client_secret].blank?
+      end
+
+      # Appliance Settings
+
+      def configure_auth_settings_oidc
+        say("Setting Appliance Authentication Settings to OpenID-Connect ...")
+        configure_auth_settings(:mode          => "httpd",
+                                :httpd_role    => true,
+                                :saml_enabled  => false,
+                                :oidc_enabled  => true,
+                                :sso_enabled   => options[:oidc_enable_sso] ? true : false,
+                                :provider_type => "oidc")
+      end
+    end
+  end
+end

data/lib/manageiq/appliance_console/saml_authentication.rb

@@ -1,11 +1,10 @@
-require "uri"
-
 module ManageIQ
   module ApplianceConsole
     class SamlAuthentication
+      include ManageIQ::ApplianceConsole::AuthUtilities
+
       MELLON_CREATE_METADATA_COMMAND = Pathname.new("/usr/libexec/mod_auth_mellon/mellon_create_metadata.sh")
 
-      HTTPD_CONFIG_DIRECTORY = Pathname.new("/etc/httpd/conf.d")
       SAML2_CONFIG_DIRECTORY = Pathname.new("/etc/httpd/saml2")
       IDP_METADATA_FILE      = SAML2_CONFIG_DIRECTORY.join("idp-metadata.xml")
 
@@ -105,14 +104,6 @@ module ManageIQ
         HTTPD_CONFIG_DIRECTORY.join("manageiq-external-auth-saml.conf").exist?
       end
 
-      def restart_httpd
-        httpd_service = LinuxAdmin::Service.new("httpd")
-        if httpd_service.running?
-          say("Restarting httpd ...")
-          httpd_service.restart
-        end
-      end
-
       # SAML IDP Metadata
 
       def validate_saml_idp_metadata_option
@@ -122,30 +113,8 @@ module ManageIQ
         raise "Missing SAML IDP metadata file #{idp_metadata}" if path_is_file?(idp_metadata) && !File.exist?(idp_metadata)
       end
 
-      def path_is_file?(path)
-        path.present? && !path_is_url?(path)
-      end
-
-      def path_is_url?(path)
-        path =~ /\A#{URI.regexp(["http", "https"])}\z/x
-      end
-
       # File Management
 
-      def remove_file(path)
-        if path.exist?
-          debug_msg("Removing #{path} ...")
-          File.delete(path)
-        end
-      end
-
-      def copy_template(dir, file)
-        src_path = template_directory.join(relative_from_root(dir), file)
-        dest_path = dir.join(file)
-        debug_msg("Copying template #{src_path} to #{dest_path} ...")
-        FileUtils.cp(src_path, dest_path)
-      end
-
       def download_network_file(source_file_url, target_file)
         require "net/http"
 
@@ -156,52 +125,16 @@ module ManageIQ
         File.write(target_file, result.body)
       end
 
-      def template_directory
-        @template_directory ||= Pathname.new(ENV.fetch("APPLIANCE_TEMPLATE_DIRECTORY"))
-      end
-
-      def relative_from_root(path)
-        path.absolute? ? path.relative_path_from(Pathname.new("/")) : path
-      end
-
       # Appliance Settings
 
       def configure_auth_settings_saml
         say("Setting Appliance Authentication Settings to SAML ...")
-        params = [
-          "/authentication/mode=httpd",
-          "/authentication/httpd_role=true",
-          "/authentication/saml_enabled=true",
-          "/authentication/oidc_enabled=false",
-          "/authentication/sso_enabled=#{options[:saml_enable_sso] ? 'true' : 'false'}",
-          "/authentication/provider_type=saml"
-        ]
-        Utilities.rake_run("evm:settings:set", params)
-      end
-
-      def configure_auth_settings_database
-        say("Setting Appliance Authentication Settings to Database ...")
-        params = [
-          "/authentication/mode=database",
-          "/authentication/httpd_role=false",
-          "/authentication/saml_enabled=false",
-          "/authentication/oidc_enabled=false",
-          "/authentication/sso_enabled=false",
-          "/authentication/provider_type=none"
-        ]
-        Utilities.rake_run("evm:settings:set", params)
-      end
-
-      # Logging
-
-      def debug_msg(msg)
-        say(msg) if options[:verbose]
-      end
-
-      def log_command_error(err)
-        say(err.result.output)
-        say(err.result.error)
-        say("")
+        configure_auth_settings(:mode          => "httpd",
+                                :httpd_role    => true,
+                                :saml_enabled  => true,
+                                :oidc_enabled  => false,
+                                :sso_enabled   => options[:saml_enable_sso] ? true : false,
+                                :provider_type => "saml")
       end
     end
   end

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '5.1.0'.freeze
+    VERSION = '5.2.0'.freeze
   end
 end

data/locales/appliance/en.yml

@@ -5,8 +5,6 @@ en:
   advanced_settings:
     menu_order:
     - networking
-    - timezone
-    - datetime
     - dbbackup
     - dbdump
     - dbrestore
@@ -24,8 +22,6 @@ en:
     - summary
     - quit
     networking: Configure Network
-    timezone: Set Timezone
-    datetime: Set Date and Time
     dbbackup: Create Database Backup
     dbdump: Create Database Dump
     dbrestore: Restore Database From Backup

data/locales/container/en.yml

@@ -4,7 +4,6 @@ en:
     name: ManageIQ
   advanced_settings:
     menu_order:
-    - timezone
     - dbrestore
     - db_config
     - db_replication
@@ -15,7 +14,6 @@ en:
     - shutdown
     - summary
     - quit
-    timezone: Set Timezone
     dbrestore: Restore Database From Backup
     db_config: Configure Database
     db_replication: Configure Database Replication

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -264,6 +264,7 @@ files:
 - bin/appliance_console
 - bin/appliance_console_cli
 - lib/manageiq-appliance_console.rb
+- lib/manageiq/appliance_console/auth_utilities.rb
 - lib/manageiq/appliance_console/certificate.rb
 - lib/manageiq/appliance_console/certificate_authority.rb
 - lib/manageiq/appliance_console/cli.rb
@@ -272,7 +273,6 @@ files:
 - lib/manageiq/appliance_console/database_replication.rb
 - lib/manageiq/appliance_console/database_replication_primary.rb
 - lib/manageiq/appliance_console/database_replication_standby.rb
-- lib/manageiq/appliance_console/date_time_configuration.rb
 - lib/manageiq/appliance_console/errors.rb
 - lib/manageiq/appliance_console/external_auth_options.rb
 - lib/manageiq/appliance_console/external_database_configuration.rb
@@ -285,12 +285,12 @@ files:
 - lib/manageiq/appliance_console/logger.rb
 - lib/manageiq/appliance_console/logging.rb
 - lib/manageiq/appliance_console/logical_volume_management.rb
+- lib/manageiq/appliance_console/oidc_authentication.rb
 - lib/manageiq/appliance_console/principal.rb
 - lib/manageiq/appliance_console/prompts.rb
 - lib/manageiq/appliance_console/saml_authentication.rb
 - lib/manageiq/appliance_console/scap.rb
 - lib/manageiq/appliance_console/temp_storage_configuration.rb
-- lib/manageiq/appliance_console/timezone_configuration.rb
 - lib/manageiq/appliance_console/utilities.rb
 - lib/manageiq/appliance_console/version.rb
 - locales/appliance/en.yml

data/lib/manageiq/appliance_console/date_time_configuration.rb

@@ -1,117 +0,0 @@
-module ManageIQ
-module ApplianceConsole
-  class DateTimeConfiguration
-    DATE_REGEXP   = /^(2[0-9]{3})-(0?[1-9]|1[0-2])-(0?[1-9]|[12][0-9]|3[01])/
-    DATE_PROMPT   = "current date (YYYY-MM-DD)".freeze
-    TIME_REGEXP   = /^(0?[0-9]|1[0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])/
-    TIME_PROMPT   = "current time in 24 hour format (HH:MM:SS)".freeze
-
-    attr_accessor :new_date, :new_time, :manual_time_sync
-
-    include ManageIQ::ApplianceConsole::Logging
-
-    def initialize
-      @new_date         = nil
-      @new_time         = nil
-      @manual_time_sync = false
-    end
-
-    def activate
-      say("Applying time configuration...")
-      establish_auto_sync &&
-        configure_date_time
-    end
-
-    def ask_questions
-      ask_establish_auto_sync
-      ask_for_date &&
-        ask_for_time &&
-        confirm
-    end
-
-    def ask_establish_auto_sync
-      say("Automatic time synchronization must be disabled to manually set date or time\n\n")
-
-      @manual_time_sync = agree(<<-EOL)
-Yes to disable Automatic time synchronization and prompt for date and time.
- No to enable  Automatic time synchronization.  (Y/N):
-
-        EOL
-    end
-
-    def ask_for_date
-      return true unless manual_time_sync
-      @new_date = just_ask(DATE_PROMPT, nil, DATE_REGEXP)
-      true
-    rescue
-      false
-    end
-
-    def ask_for_time
-      return true unless manual_time_sync
-      @new_time = just_ask(TIME_PROMPT, nil, TIME_REGEXP)
-      true
-    rescue
-      false
-    end
-
-    def confirm
-      manual_time_sync ? confirm_manual : confirm_auto
-    end
-
-    def confirm_auto
-      clear_screen
-      say("Date and Time Configuration will be automatic")
-
-      agree("Apply automatic time configuration? (Y/N): ")
-    end
-
-    def confirm_manual
-      clear_screen
-      say(<<-EOL)
-Date and Time Configuration
-
-        Date: #{new_date}
-        Time: #{new_time}
-
-        EOL
-
-      agree("Apply manual time configuration? (Y/N): ")
-    end
-
-    def establish_auto_sync
-      manual_time_sync ? disable_auto_sync : enable_auto_sync
-    end
-
-    def enable_auto_sync
-      LinuxAdmin::Service.new("chronyd").enable.start
-      LinuxAdmin::Service.new("systemd-timedated").restart
-      true
-    rescue => e
-      say("Failed to enable time synchronization")
-      logger.error("Failed to enable time synchronization: #{e.message}")
-      false
-    end
-
-    def disable_auto_sync
-      LinuxAdmin::Service.new("chronyd").stop.disable
-      LinuxAdmin::Service.new("systemd-timedated").restart
-      true
-    rescue => e
-      say("Failed to disable time synchronization")
-      logger.error("Failed to disable time synchronization: #{e.message}")
-      false
-    end
-
-    def configure_date_time
-      return true unless manual_time_sync
-      LinuxAdmin::TimeDate.system_time = Time.parse("#{new_date} #{new_time}").getlocal
-      true
-    rescue => e
-      say("Failed to apply time configuration")
-      logger.error("Failed to apply time configuration: #{e.message}")
-      false
-    end
-  end # class DateTimeConfiguration
-end # module ApplianceConsole
-end

data/lib/manageiq/appliance_console/timezone_configuration.rb

@@ -1,58 +0,0 @@
-require "linux_admin"
-
-module ManageIQ
-module ApplianceConsole
-  class TimezoneConfiguration
-    include ManageIQ::ApplianceConsole::Logging
-
-    attr_reader   :current_timzone
-    attr_accessor :new_timezone
-
-    def initialize(region_timezone_string)
-      @current_timezone = region_timezone_string
-    end
-
-    def activate
-      log_and_feedback(__method__) do
-        say("Applying new timezone #{new_timezone}...")
-        begin
-          LinuxAdmin::TimeDate.system_timezone = new_timezone
-        rescue LinuxAdmin::TimeDate::TimeCommandError => e
-          say("Failed to apply timezone configuration")
-          logger.error("Failed to timezone configuration: #{e.message}")
-          return false
-        end
-      end
-      true
-    end
-
-    def ask_questions
-      ask_for_timezone && confirm
-    end
-
-    def ask_for_timezone
-      current_item = timezone_hash
-
-      while current_item.is_a?(Hash)
-        selection = ask_with_menu("Geographic Location", current_item.keys, nil, false)
-        return false if selection == CANCEL
-        current_item = current_item[selection]
-      end
-
-      @new_timezone = current_item
-      true
-    end
-
-    def confirm
-      clear_screen
-      agree("Change the timezone to #{new_timezone}? (Y/N): ")
-    end
-
-    def timezone_hash
-      LinuxAdmin::TimeDate.timezones.each_with_object({}) do |tz, hash|
-        hash.store_path(*tz.split("/"), tz)
-      end
-    end
-  end # class TimezoneConfiguration
-end # module ApplianceConsole
-end