manageiq-appliance_console 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0a7cbd85921dd1332fbaa9b01329e3bc2a5197be9e12ea928f9737ee499003
-  data.tar.gz: 9a8fd3d5d58239eec4c21ce7efb4ecb2546215b7e0f66ec2a14c2f6fe81e66b6
+  metadata.gz: 9ed41ad025c3f0f288361b95b827806b630519a9d7d14dbb708fbb6737754a9f
+  data.tar.gz: 7a12bc4a13675a1350f8df4b9ded7500da77b03638ba3412d64857e958aa783b
 SHA512:
-  metadata.gz: ed57328bff42362e4a51920baa3268ed3a2d8d6e16a8b0da493eec419c65e05763ba820a0e195b61279bc521f4c012d0a5246fb9ebeacc5354543d89136eb8bd
-  data.tar.gz: 80e710fa562abca7f2a935b9828ebc91841730f9eac789214a35bc64439e011b07918cfea629649d11519eee676bd6264b404e6762b7ce3d6bbbaf94d372f824
+  metadata.gz: 36860fdccb66a1e153a848e2c5e579bfcd802685e25fd32bdf13cbd1c2a78b3723b59733267cb4b38a5f86e954ae4bcb8bf182c7de675daf92b2ba0f44c185c1
+  data.tar.gz: 361a36c04caece0df425490174477a2a70af553cf56ebee7764656f561a99577adc0be7cdf63f09b49818bdd0949400442c0da5b9a1ba846a0e9fff4ccb62ff7

data/lib/manageiq/appliance_console/database_maintenance.rb

@@ -30,6 +30,6 @@ module ApplianceConsole
       self.executed_periodic_action = periodic.activate
       executed_hourly_action || executed_periodic_action
     end
-  end # class DatabaseMaintenance < DatabaseConfiguration
+  end # class DatabaseMaintenance
 end # module ApplianceConsole
 end

data/lib/manageiq/appliance_console/database_maintenance_hourly.rb

@@ -53,6 +53,6 @@ module ApplianceConsole
         f.write("exit 0\n")
       end
     end
-  end # class DatabaseMaintenance < DatabaseConfiguration
+  end # class DatabaseMaintenanceHourly
 end # module ApplianceConsole
 end

data/lib/manageiq/appliance_console/database_replication.rb

@@ -142,6 +142,6 @@ Replication Server Configuration
         :password => database_password
       }
     end
-  end # class DatabaseReplication < DatabaseConfiguration
+  end # class DatabaseReplication
 end # module ApplianceConsole
 end

data/lib/manageiq/appliance_console/date_time_configuration.rb

@@ -112,6 +112,6 @@ Date and Time Configuration
       logger.error("Failed to apply time configuration: #{e.message}")
       false
     end
-  end # class TimezoneConfiguration
+  end # class DateTimeConfiguration
 end # module ApplianceConsole
 end

data/lib/manageiq/appliance_console/internal_database_configuration.rb

@@ -6,7 +6,7 @@ require "linux_admin"
 module ManageIQ
 module ApplianceConsole
   class InternalDatabaseConfiguration < DatabaseConfiguration
-    attr_accessor :disk, :ssl, :run_as_evm_server
+    attr_accessor :disk, :run_as_evm_server
 
     DEDICATED_DB_SHARED_BUFFERS = "'1GB'".freeze
     SHARED_DB_SHARED_BUFFERS = "'128MB'".freeze
@@ -88,6 +88,7 @@ module ApplianceConsole
       log_and_feedback(__method__) do
         PostgresAdmin.prep_data_directory
         run_initdb
+        configure_ssl
         relabel_postgresql_dir
         configure_postgres
         start_postgres
@@ -98,10 +99,8 @@ module ApplianceConsole
     end
 
     def configure_postgres
-      self.ssl = File.exist?(PostgresAdmin.certificate_location.join("postgres.key"))
-
       copy_template "postgresql.conf"
-      copy_template "pg_hba.conf.erb"
+      copy_template "pg_hba.conf"
       copy_template "pg_ident.conf"
     end
 
@@ -115,14 +114,8 @@ module ApplianceConsole
       PostgresAdmin.mount_point
     end
 
-    def copy_template(src, src_dir = self.class.postgresql_template, dest_dir = PostgresAdmin.data_directory)
-      full_src = src_dir.join(src)
-      if src.include?(".erb")
-        full_dest = dest_dir.join(src.gsub(".erb", ""))
-        File.open(full_dest, "w") { |f| f.puts ERB.new(File.read(full_src), nil, '-').result(binding) }
-      else
-        FileUtils.cp full_src, dest_dir
-      end
+    def copy_template(src)
+      FileUtils.cp(self.class.postgresql_template.join(src), PostgresAdmin.data_directory)
     end
 
     def pg_mount_point?
@@ -175,13 +168,21 @@ module ApplianceConsole
 
     def apply_initial_configuration
       shared_buffers = run_as_evm_server ? SHARED_DB_SHARED_BUFFERS : DEDICATED_DB_SHARED_BUFFERS
-      with_pg_connection do |conn|
-        conn.exec("ALTER SYSTEM SET ssl TO on") if ssl
-        conn.exec("ALTER SYSTEM SET shared_buffers TO #{shared_buffers}")
-      end
+      with_pg_connection { |conn| conn.exec("ALTER SYSTEM SET shared_buffers TO #{shared_buffers}") }
 
       restart_postgres
     end
+
+    def configure_ssl
+      cert_file = self.class.postgres_dir.join("server.crt").to_s
+      key_file  = self.class.postgres_dir.join("server.key").to_s
+      AwesomeSpawn.run!("/usr/bin/generate_miq_server_cert.sh", :env => {"NEW_CERT_FILE" => cert_file, "NEW_KEY_FILE"  => key_file})
+
+      FileUtils.chown("postgres", "postgres", cert_file)
+      FileUtils.chown("postgres", "postgres", key_file)
+      FileUtils.chmod(0644, cert_file)
+      FileUtils.chmod(0600, key_file)
+    end
   end
 end
 end

data/lib/manageiq/appliance_console/logical_volume_management.rb

@@ -41,10 +41,15 @@ module ApplianceConsole
     private
 
     def create_partition_to_fill_disk
-      disk.create_partition_table
-      AwesomeSpawn.run!("parted -s #{disk.path} mkpart primary 0% 100%")
-
+      # Check if you need to create a GPT part table or a MSDOS one in base of
+      # max size of partition table
+      max_msdos_ptable_size = 2.terabyte
       self.disk = LinuxAdmin::Disk.local.find { |d| d.path == disk.path }
+
+      partition_type = disk.size >= max_msdos_ptable_size ? 'gpt' : 'msdos'
+      disk.create_partition_table(partition_type)
+
+      AwesomeSpawn.run!("parted -s #{disk.path} mkpart primary 0% 100%")
       @partition = disk.partitions.first
     end
 

data/lib/manageiq/appliance_console/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-appliance_console
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord