manageiq-appliance_console 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f188ab603867069d87c287bd0176594c92540fef4f12fd730a61df217168d46c
-  data.tar.gz: 3f4c1066c3e2889d34f60976438182e91e8129557b8ac19ba4f1d481b28385d6
+  metadata.gz: '01151816500b80c49674ed6063ce8af2b732da048bcbcf3b39e4462acd6cc5fd'
+  data.tar.gz: 8ec934a3b7a9a6b350b295bec3a1e4c03c9e51ad2f8ba57cdedb3c032de51455
 SHA512:
-  metadata.gz: 8ce788e513a9732a2f2095e996506a0ae3b693ae274a9dac83c9ee856084b394cbfa72666e274fbaf985cad6ed288ecaec88ddc935f31c8937a0160b10cb0f74
-  data.tar.gz: 8368a4fcebfd4904f46b6f8970916fcbeaa12dea4322b93b5f299ffad43e2fc06e6c952c266c765e288236d5e86a3f57f89a0ced5b55652f53b4cddf6a5d6392
+  metadata.gz: 1e333fea67f0f233844fef49a344b3eccdf9c30011938768b9dcea61666a35573d5e51e98bb10ee656985d6284f24a384a3c0fdb7171b21dc7c34db34d45d479
+  data.tar.gz: 01b0b87561bcfc018ce5eb487346878d167101579de130545bbc235b17eab6a0c1b0143796fd13e0352d15d7ea3c25e825303134e6436f6dbb198fd5f6fea2d6

data/bin/appliance_console

@@ -73,6 +73,24 @@ CLOUD_INIT_DISABLE_NETWORK_CONFIG = "network: {config: disabled}\n".freeze
 
 module ManageIQ
 module ApplianceConsole
+  def ensure_key_configured
+    key_config = ManageIQ::ApplianceConsole::KeyConfiguration.new
+    unless key_config.key_exist?
+      say "No encryption key found.\n"
+      say "For migrations, copy encryption key from a hardened appliance."
+      say "For worker and multi-region setups, copy key from another appliance.\n"
+      say "If this is your first appliance, just generate one now.\n\n"
+
+      if key_config.ask_question_loop
+        say("\nEncryption key now configured.\n\n")
+      else
+        say("\nEncryption key not configured.")
+        press_any_key
+        raise MiqSignalError
+      end
+    end
+  end
+
   eth0 = LinuxAdmin::NetworkInterface.new(NETWORK_INTERFACE)
   # Because it takes a few seconds, get the region once in the outside loop
   region = ManageIQ::ApplianceConsole::DatabaseConfiguration.region
@@ -457,21 +475,7 @@ Static Network Configuration
       when I18n.t("advanced_settings.db_config")
         say("#{selection}\n\n")
 
-        key_config = ManageIQ::ApplianceConsole::KeyConfiguration.new
-        unless key_config.key_exist?
-          say "No encryption key found.\n"
-          say "For migrations, copy encryption key from a hardened appliance."
-          say "For worker and multi-region setups, copy key from another appliance.\n"
-          say "If this is your first appliance, just generate one now.\n\n"
-
-          if key_config.ask_question_loop
-            say("\nEncryption key now configured.\n\n")
-          else
-            say("\nEncryption key not configured.")
-            press_any_key
-            raise MiqSignalError
-          end
-        end
+        ensure_key_configured
 
         options = {
           "Create Internal Database"           => "create_internal",
@@ -524,6 +528,7 @@ Static Network Configuration
         when "standby"
           db_replication = ManageIQ::ApplianceConsole::DatabaseReplicationStandby.new
           logger.info("Configuring Server as Standby")
+          ensure_key_configured
         end
 
         if db_replication.ask_questions && db_replication.activate

data/lib/manageiq/appliance_console/database_replication_standby.rb

@@ -63,6 +63,7 @@ module ApplianceConsole
       stop_repmgrd
       initialize_postgresql_disk if disk
       PostgresAdmin.prep_data_directory if disk || resync_data
+      save_database_yml
       generate_cluster_name &&
         create_config_file(standby_host) &&
         clone_standby_server &&
@@ -143,6 +144,10 @@ module ApplianceConsole
 
     private
 
+    def save_database_yml
+      InternalDatabaseConfiguration.new(:password => database_password).save
+    end
+
     def record_for_node_number
       c = PG::Connection.new(primary_connection_hash)
       c.exec_params(<<-SQL, [node_number]).map_types!(PG::BasicTypeMapForResults.new(c)).first

data/lib/manageiq/appliance_console/internal_database_configuration.rb

@@ -41,7 +41,7 @@ module ApplianceConsole
       end
       initialize_postgresql_disk if disk
       initialize_postgresql
-      return super if run_as_evm_server
+      run_as_evm_server ? (return super) : save
       true
     end
 

data/lib/manageiq/appliance_console/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module ApplianceConsole
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.0.2'.freeze
   end
 end

metadata

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