manageiq-appliance_console 7.1.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a87349bf14d9211aa40088c39668407f50545de717a9da552e74430a44750e5
-  data.tar.gz: 4f3a63c811e3e0e4db435fa96a476c8d5988cd4b70eab125abe5fa0a9812c976
+  metadata.gz: 81ef1030034c190aa4fc241853afd0f5e40395b4fd8d94b9c0782253462c8d71
+  data.tar.gz: 28d2102f5ff3b9248db6856b2da027b8562f0481292f7d28ddbae3ce91fb4f21
 SHA512:
-  metadata.gz: e620e0826634427b14394181875562130e9997d7969fd8a6886124b2b1ba5d61f936a293b37c886b771e3f4f1d5529150dfe2a65ed12a3dd753bfe7f2c2ee3ad
-  data.tar.gz: b17e8214b2a508c01107281d1177517af80c839fbb1cc64ec5cff696383029b11e54319eac18078a324ec2e04bec7e9bd90d3a9f9d6855ef1979fbd2d63ed480
+  metadata.gz: 4e563cc050899e2b62e8bc3546664d3c28c3abbb0979328fa0125c4e38ef9910553f938a317d144238205c2c76e98dc3de7ef963e3ac8e80f7f8761cc117fe0c
+  data.tar.gz: 524948a3576e46b19de0fb94f1248d16805e4d4dec94b5e29730e72065dd266edad5f76db73b94165c33b7de289208421e8d153a0cf24a013c1064452e9b834c

data/bin/appliance_console

@@ -431,7 +431,6 @@ Static Network Configuration
             raise MiqSignalError
           elsif message_server.ask_questions && message_server.configure
             say("\nMessage Server configured successfully.\n")
-            press_any_key
           else
             say("\nMessage Server configuration failed!\n")
             press_any_key
@@ -448,7 +447,6 @@ Static Network Configuration
             raise MiqSignalError
           elsif message_client.ask_questions && message_client.configure
             say("\nMessage Client configured successfully.\n")
-            press_any_key
           else
             say("\nMessage Client configuration failed!\n")
             press_any_key

data/lib/manageiq/appliance_console/database_replication.rb

@@ -7,11 +7,20 @@ module ApplianceConsole
   class DatabaseReplication
     include ManageIQ::ApplianceConsole::Logging
 
-    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
 
+    REPGMR_FILE_LOCATIONS = {
+      "repmgr10" => {
+        "config" => "/etc/repmgr/10/repmgr.conf",
+        "log"    => "/var/log/repmgr/repmgrd.log"
+      },
+      "repmgr13" => {
+        "config" => "/etc/repmgr/13/repmgr.conf",
+        "log"    => "/var/log/repmgr/repmgrd-13.log"
+      }
+    }.freeze
+
     attr_accessor :node_number, :database_name, :database_user,
                   :database_password, :primary_host
 
@@ -37,33 +46,53 @@ Replication Server Configuration
         EOL
     end
 
-    def repmgr_configured?
-      File.exist?(REPMGR_CONFIG)
+    def self.repmgr_config
+      repmgr_file_locations["config"]
+    end
+
+    def self.repmgr_configured?
+      File.exist?(repmgr_config)
+    end
+
+    def self.repmgr_file_locations
+      REPGMR_FILE_LOCATIONS[repmgr_service_name]
     end
 
+    def self.repmgr_log
+      repmgr_file_locations["log"]
+    end
+
+    def self.repmgr_service_name
+      @repmgr_service_name ||= File.exist?(REPGMR_FILE_LOCATIONS["repmgr13"]["config"]) ? "repmgr13" : "repmgr10"
+    end
+
+    delegate :repmgr_config, :repmgr_configured?, :repmgr_file_locations, :repmgr_log, :repmgr_service_name, :to => self
+
     def confirm_reconfiguration
-      say("Warning: File #{REPMGR_CONFIG} exists. Replication is already configured")
-      logger.warn("Warning: File #{REPMGR_CONFIG} exists. Replication is already configured")
+      say("Warning: File #{repmgr_config} exists. Replication is already configured")
+      logger.warn("Warning: File #{repmgr_config} exists. Replication is already configured")
       agree("Continue with configuration? (Y/N): ")
     end
 
     def create_config_file(host)
-      File.write(REPMGR_CONFIG, config_file_contents(host))
+      File.write(repmgr_config, config_file_contents(host))
       true
     end
 
     def config_file_contents(host)
       service_name = PostgresAdmin.service_name
+      # FYI, 5.0 made quoting strings strict.  Always use single quoted strings.
+      # https://repmgr.org/docs/current/release-5.0.html
       <<-EOS.strip_heredoc
-        node_id=#{node_number}
-        node_name=#{host}
+        node_id='#{node_number}'
+        node_name='#{host}'
         conninfo='host=#{host} user=#{database_user} dbname=#{database_name}'
-        use_replication_slots=1
+        use_replication_slots='1'
         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'
-        log_file=#{REPMGR_LOG}
+        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'
+        log_file='#{repmgr_log}'
         service_start_command='sudo systemctl start #{service_name}'
         service_stop_command='sudo systemctl stop #{service_name}'
         service_restart_command='sudo systemctl restart #{service_name}'

data/lib/manageiq/appliance_console/database_replication_standby.rb

@@ -8,7 +8,6 @@ module ApplianceConsole
     include ManageIQ::ApplianceConsole::Logging
 
     REGISTER_CMD    = 'repmgr standby register'.freeze
-    REPMGRD_SERVICE = 'repmgr10'.freeze
 
     attr_accessor :disk, :standby_host, :run_repmgrd_configuration, :resync_data, :force_register
 
@@ -111,7 +110,7 @@ module ApplianceConsole
     end
 
     def start_repmgrd
-      LinuxAdmin::Service.new(REPMGRD_SERVICE).enable.start
+      LinuxAdmin::Service.new(repmgr_service_name).enable.start
       true
     rescue AwesomeSpawn::CommandResultError => e
       message = "Failed to start repmgrd: #{e.message}"
@@ -121,7 +120,7 @@ module ApplianceConsole
     end
 
     def stop_repmgrd
-      LinuxAdmin::Service.new(REPMGRD_SERVICE).stop
+      LinuxAdmin::Service.new(repmgr_service_name).stop
       true
     end
 

data/lib/manageiq/appliance_console/message_configuration.rb

@@ -108,20 +108,16 @@ module ManageIQ
 
         messaging_yaml = YAML.load_file(messaging_yaml_sample_path)
 
-        messaging_yaml["production"].delete("username")
-        messaging_yaml["production"].delete("password")
-
-        messaging_yaml["production"]["hostname"]          = message_server_host
-        messaging_yaml["production"]["port"]              = message_server_port
-        messaging_yaml["production"]["sasl.mechanism"]    = "PLAIN"
-        messaging_yaml["production"]["sasl.username"]     = message_keystore_username
-        messaging_yaml["production"]["sasl.password"]     = ManageIQ::Password.try_encrypt(message_keystore_password)
+        messaging_yaml["production"]["host"]      = message_server_host
+        messaging_yaml["production"]["port"]      = message_server_port
+        messaging_yaml["production"]["username"]  = message_keystore_username
+        messaging_yaml["production"]["password"]  = ManageIQ::Password.try_encrypt(message_keystore_password)
 
         if secure?
-          messaging_yaml["production"]["security.protocol"] = "SASL_SSL"
-          messaging_yaml["production"]["ssl.ca.location"]   = ca_cert_path.to_path
+          messaging_yaml["production"]["ssl"]     = true
+          messaging_yaml["production"]["ca_file"] = ca_cert_path.to_path
         else
-          messaging_yaml["production"]["security.protocol"] = "PLAINTEXT"
+          messaging_yaml["production"]["ssl"] = false
         end
 
         File.open(messaging_yaml_path, "w") do |f|

data/lib/manageiq/appliance_console/message_configuration_server.rb

@@ -72,6 +72,11 @@ module ManageIQ
         say("\nMessage Server Parameters:\n\n")
 
         @message_server_host       = ask_for_string("Message Server Hostname or IP address", message_server_host)
+
+        # SSL Validation for Kafka does not work for hostnames containing "localhost"
+        # Therefore we replace with the equivalent IP "127.0.0.1" if a /localhost*/ hostname was entered
+        @message_server_host       = "127.0.0.1" if @message_server_host.include?("localhost")
+
         @message_keystore_username = ask_for_string("Message Keystore Username", message_keystore_username)
         @message_keystore_password = ask_for_password("Message Keystore Password")
         @message_persistent_disk   = ask_for_persistent_disk

data/lib/manageiq/appliance_console/postgres_admin.rb

@@ -62,13 +62,18 @@ module ApplianceConsole
       LinuxAdmin::Service.new(service_name).running?
     end
 
-    def self.local_server_in_recovery?
-      data_directory.join("recovery.conf").exist?
+    def self.local_server_received_standby_signal?
+      # Beginning with PostgreSQL 12, replication configuration has been integrated into the main PostgreSQL configuraton system and the conventional recovery.conf file is no longer valid.
+      # see: https://repmgr.org/docs/current/release-5.0.html
+      # https://www.2ndquadrant.com/en/blog/replication-configuration-changes-in-postgresql-12/
+      # "standby.signal" – indicates the server should start up as a hot standby
+      # If a standby is promoted, "standby.signal" is removed entirely (and not renamed as was the case with "recovery.conf", which became "recovery.done").
+      data_directory.join("standby.signal").exist? || data_directory.join("recovery.conf").exist?
     end
 
     def self.local_server_status
       if service_running?
-        "running (#{local_server_in_recovery? ? "standby" : "primary"})"
+        "running (#{local_server_received_standby_signal? ? "standby" : "primary"})"
       elsif initialized?
         "initialized and stopped"
       else

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '7.1.1'.freeze
+    VERSION = '7.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -410,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: ManageIQ Appliance Console