beaker-answers 0.18.0 → 0.19.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjg4YzhjMzFmZjY3NGU5NjZhNDU0ZDZiODYyMDc4NjgyYWY3OTIzNQ==
+    NGExODA0NjAzYmM2NzRmOGI4NzY2YmE2NjQ1MzRlODhmNzU5NjA2YQ==
   data.tar.gz: !binary |-
-    YzhmMWU5YjlhNzAxOTIxZDk1M2ZlMTNhZWFjNTQzZWE1ZTE5Mjk0YQ==
+    NWY0ODA1NTU4NTgxYTMwMDE4MDBhNTUwYWE5NGY4NjBlZmY2ZWVhZA==
 SHA512:
   metadata.gz: !binary |-
-    NjNjNzAzM2I2Y2Q5ZDczNTU1NTk0NjIxY2EwNjZiYzg3ZWQ1MDhmNmYyNDAx
-    OGRkODkyOGYzMjQ1ZmJkZDFiNTVhMTY1ZWQ2MzE1OTZmODNlZjczMWJlNjk3
-    MWFiZWI1MjBlODNmMDcxNjA4ZTM5NjViMDI0N2YxMWVmYTdjYTg=
+    ZWU4N2E0NDg4NDFlMjY4YzQ3ZmU2MWVhMjg4NjcyYzE5NDllZTliZTk1MjM3
+    YmEyNjg1ZGYyMDA0NjMwNWFmMWYwMGQ1ZjIwNjE3NzUwNzdkZjFmZDc4Mzll
+    MGUzNTJmMTY3OGI0NTFiNTAyMjMxOGNmNjk4MWU0ZDhiZTZmMTc=
   data.tar.gz: !binary |-
-    ZmFhMzNjZjNkMTNjYzhmMjQxY2VlMzczMGI4YTdjYTIyNjBmZDQ0OGE3ZGQz
-    YjViNWYxMzczZGFmNmQ1MGI1NDRkZmQ3MmMzNjY5YjY4MDNhMjkwNDkzMmVh
-    NGMwZWRjNmNlMWVhNGI5M2NmYjQ0ZjA1ZmUxYmVmN2FiOWVhZGQ=
+    ZDYzNGY3YTIzYTQ2NzVkYTc2OTBiOGVhZTg0YTNjYTU3ZTNkNTlhZGU2YTJl
+    ZTAzMjJkMGM0NzQ5ZWRhN2ZmNjg5YWI4NDViOWY0YTFhMjIwMGZiMGVlNzU3
+    NjQ5N2FhY2MxMjE1MjQyZmI4Mjg3YzhjODdlOThhNjNmOTk0Zjg=

data/lib/beaker-answers/pe_conf.rb

@@ -82,6 +82,19 @@ module BeakerAnswers
         pe_conf["#{ns}::puppetdb_host"] = puppetdb.hostname
       end
 
+      if the_host_with_role('pe_postgres', raise_error=false)
+        pe_conf["#{ns}::database_host"] = the_host_with_role('pe_postgres', raise_error=false).hostname
+        if options[:pe_postgresql_options]
+          if options[:pe_postgresql_options][:security] == 'cert'
+            postgres_cert_answers(pe_conf, '1.0')
+          elsif options[:pe_postgresql_options][:security] == 'password'
+            postgres_password_answers(pe_conf, '1.0')
+          end
+        else
+          postgres_password_answers(pe_conf, '1.0')
+        end
+      end
+
       pe_conf
     end
 
@@ -119,6 +132,18 @@ module BeakerAnswers
         conf
       end
 
+      #Set the PE managed postgres roles/answers
+      if the_host_with_role('pe_postgres', raise_error=false)
+        pe_conf["puppet_enterprise::profile::database"] = the_host_with_role('pe_postgres', raise_error=false).hostname
+        if options[:pe_postgresql_options][:security]
+          if options[:pe_postgresql_options][:security] == 'cert'
+            postgres_cert_answers(pe_conf, "2.0")
+          elsif options[:pe_postgresql_options][:security] == 'password'
+            postgres_password_answers(pe_conf, "2.0")
+          end
+        end
+      end
+
       # Collect a uniq array of all host platforms modified to pe_repo class format
       platforms = hosts.map do |h|
         platform = h['platform']
@@ -149,18 +174,41 @@ module BeakerAnswers
     # one host is found to have the provided role.
     #
     # @param [String] role The host returned will have this role in its role list
+    # @param [String] raise_error defaults to true if you want this method to return
+    #   an error if there are no hosts, or if there are too many hosts
     # @return [Host] The single host with the desired role in its roles list
     # @raise [ArgumentError] Raised if more than one host has the given role
     #   defined, or if no host has the role defined.
-    def the_host_with_role(role)
+    def the_host_with_role(role, raise_error=true)
       found_hosts = hosts.select do |h|
         Array(h['roles']).include?(role.to_s)
       end
 
-      if found_hosts.length == 0 or found_hosts.length > 1
+      if (found_hosts.length == 0 or found_hosts.length > 1) && (raise_error)
         raise ArgumentError, "There should be one host with #{role} defined, found #{found_hosts.length} matching hosts (#{found_hosts})"
       end
       found_hosts.first
     end
+
+    def postgres_cert_answers(pe_conf, meep_schema_version)
+      case meep_schema_version
+      when '1.0','2.0'
+        pe_conf["puppet_enterprise::database_ssl"] = true
+        pe_conf["puppet_enterprise::database_cert_auth"] = true
+      end
+      pe_conf
+    end
+
+    def postgres_password_answers(pe_conf, meep_schema_version)
+      case meep_schema_version
+      when '1.0','2.0'
+        pe_conf["puppet_enterprise::activity_database_password"] = "PASSWORD"
+        pe_conf["puppet_enterprise::classifier_database_password"] = "PASSWORD"
+        pe_conf["puppet_enterprise::orchestrator_database_password"] = "PASSWORD"
+        pe_conf["puppet_enterprise::puppetdb_database_password"] = "PASSWORD"
+        pe_conf["puppet_enterprise::rbac_database_password"] = "PASSWORD"
+      end
+      pe_conf
+    end
   end
 end

data/lib/beaker-answers/version.rb

@@ -1,5 +1,5 @@
 module BeakerAnswers
   module Version
-    STRING = '0.18.0'
+    STRING = '0.19.0'
   end
 end

data/spec/beaker-answers/pe_conf_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'BeakerAnswers::PeConf' do
   let(:basic_hosts) { make_hosts({'pe_ver' => ver }, host_count) }
+  let(:host) { Beaker::Host.create('host', {}, make_host_opts('host', options.merge(platform))) }
 
   RSpec.shared_examples 'pe.conf configuration' do
     context 'monolithic' do
@@ -21,6 +22,41 @@ describe 'BeakerAnswers::PeConf' do
       end
     end
 
+    context 'pe_postgres_cert' do
+      let(:host_count) { 2 }
+      let(:hosts) do
+        basic_hosts[0][:pe_postgresql_options] = {:security=>"cert"}
+        basic_hosts[0]['roles'] = ['master', 'dashboard', 'database', 'agent']
+        basic_hosts[0]['platform'] = 'el-6-x86_64'
+        basic_hosts[1]['roles'] = ['agent', 'pe_postgres']
+        basic_hosts[1]['platform'] = 'el-6-x86_64'
+        basic_hosts
+      end
+
+      it 'generates a hash of monolithic configuring that uses an external postgres with cert setup' do
+        expect(BeakerAnswers::PeConf.new(hosts, meep_schema_version, {:pe_postgresql_options => {:security => "cert"}}).configuration_hash).to(
+          match(gold_pe_postgres_cert_configuration_hash)
+        )
+      end
+    end
+
+    context 'pe_postgres_password' do
+      let(:host_count) { 2 }
+      let(:hosts) do
+        basic_hosts[0]['roles'] = ['master', 'dashboard', 'database', 'agent']
+        basic_hosts[0]['platform'] = 'el-6-x86_64'
+        basic_hosts[1]['roles'] = ['agent', 'pe_postgres']
+        basic_hosts[1]['platform'] = 'el-6-x86_64'
+        basic_hosts
+      end
+
+      it 'generates a hash of monolithic configuring that uses an external postgres with passwords' do
+        expect(BeakerAnswers::PeConf.new(hosts, meep_schema_version,  {:pe_postgresql_options => {:security => "password"}}).configuration_hash).to(
+          match(gold_pe_postgres_password_configuration_hash)
+        )
+      end
+    end
+
     context 'split' do
       let(:host_count) { 6 }
       let(:hosts) do
@@ -62,7 +98,25 @@ describe 'BeakerAnswers::PeConf' do
         "puppet_enterprise::puppetdb_host" => basic_hosts[2].hostname,
       }
     end
-
+    let(:gold_pe_postgres_cert_configuration_hash) do
+      {
+        "puppet_enterprise::database_cert_auth" => true,
+        "puppet_enterprise::database_ssl" => true,
+        "puppet_enterprise::puppet_master_host" => basic_hosts[0].hostname,
+        "puppet_enterprise::database_host" => basic_hosts[1].hostname
+      }
+    end
+    let(:gold_pe_postgres_password_configuration_hash) do
+      {
+        "puppet_enterprise::activity_database_password" => "PASSWORD",
+        "puppet_enterprise::classifier_database_password" => "PASSWORD",
+        "puppet_enterprise::orchestrator_database_password" => "PASSWORD",
+        "puppet_enterprise::puppetdb_database_password" => "PASSWORD",
+        "puppet_enterprise::rbac_database_password" => "PASSWORD",
+        "puppet_enterprise::puppet_master_host" => basic_hosts[0].hostname,
+        "puppet_enterprise::database_host" => basic_hosts[1].hostname
+      }
+    end
     include_examples 'pe.conf configuration'
   end
 
@@ -78,6 +132,33 @@ describe 'BeakerAnswers::PeConf' do
         "meep_schema_version" => "2.0",
       }
     end
+    let(:gold_pe_postgres_cert_configuration_hash) do
+      {
+        "node_roles" => {
+          "pe_role::monolithic::primary_master" => [basic_hosts[0].hostname],
+        },
+        "puppet_enterprise::profile::database" => basic_hosts[1].hostname,
+        "agent_platforms" => ['el_6_x86_64'],
+        "meep_schema_version" => "2.0",
+        "puppet_enterprise::database_cert_auth" => true,
+        "puppet_enterprise::database_ssl" => true,
+      }
+    end
+    let(:gold_pe_postgres_password_configuration_hash) do
+      {
+        "node_roles" => {
+          "pe_role::monolithic::primary_master" => [basic_hosts[0].hostname],
+        },
+        "puppet_enterprise::profile::database" => basic_hosts[1].hostname,
+        "agent_platforms" => ['el_6_x86_64'],
+        "meep_schema_version" => "2.0",
+        "puppet_enterprise::activity_database_password" => "PASSWORD",
+        "puppet_enterprise::classifier_database_password" => "PASSWORD",
+        "puppet_enterprise::orchestrator_database_password" => "PASSWORD",
+        "puppet_enterprise::puppetdb_database_password" => "PASSWORD",
+        "puppet_enterprise::rbac_database_password" => "PASSWORD",
+      }
+    end
     let(:gold_split_configuration_hash) do
       {
         "node_roles" => {
@@ -97,4 +178,103 @@ describe 'BeakerAnswers::PeConf' do
 
     include_examples 'pe.conf configuration'
   end
+
+  describe 'the_host_with_role' do
+    let(:host_count) { 2 }
+    let(:mono_basic_hosts)   { make_hosts( { :pe_ver => '3.0',
+                                      :platform => 'linux',
+                                      :roles => [ 'agent' ],
+                                        :type => 'pe'}, 4 ) }
+    let(:mono_hosts) do
+      mono_basic_hosts[0]['roles'] = ['master', 'dashboard', 'database', 'agent']
+      mono_basic_hosts[0]['platform'] = 'el-6-x86_64'
+      mono_basic_hosts[1]['roles'] = ['agent']
+      mono_basic_hosts[1]['platform'] = 'el-6-x86_64'
+      mono_basic_hosts
+    end
+    let(:host_count) { 4 }
+    let(:split_basic_hosts)   { make_hosts( { :pe_ver => '3.0',
+                                      :platform => 'linux',
+                                      :roles => [ 'agent' ],
+                                             :type => 'pe'}, 4 ) }
+    let(:split_hosts) do
+      split_basic_hosts[0]['roles'] = ['master','agent']
+      split_basic_hosts[0]['platform'] = 'el-6-x86_64'
+      split_basic_hosts[1]['roles'] = ['database','agent']
+      split_basic_hosts[1]['platform'] = 'el-6-x86_64'
+      split_basic_hosts[2]['roles'] = ['dashboard','agent']
+      split_basic_hosts[2]['platform'] = 'el-6-x86_64'
+      split_basic_hosts[3]['roles'] = ['agent']
+      split_basic_hosts[3]['platform'] = 'el-6-x86_64'
+      split_basic_hosts
+    end
+
+    it 'returns master in monolithic' do
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'master')).to eq(mono_basic_hosts[0])
+    end
+
+    it 'returns database in monolithic' do
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'database')).to eq(mono_basic_hosts[0])
+    end
+
+    it 'returns dashboard in monolithic' do
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'dashboard')).to eq(mono_basic_hosts[0])
+    end
+
+    it 'returns master in split' do
+      peconf = BeakerAnswers::PeConf.new(split_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'master')).to eq(split_basic_hosts[0])
+    end
+
+    it 'returns database in split' do
+      peconf = BeakerAnswers::PeConf.new(split_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'database')).to eq(split_basic_hosts[1])
+    end
+
+    it 'returns dashboard in split' do
+      peconf = BeakerAnswers::PeConf.new(split_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'dashboard')).to eq(split_basic_hosts[2])
+    end
+
+    it 'raises an error if multiple hosts have master role' do
+      mono_hosts[1]['roles'] = ['master','agent']
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect{ peconf.send(:the_host_with_role, 'master') }.to raise_error(ArgumentError)
+    end
+
+    it 'raises an error if multiple hosts have database role' do
+      mono_hosts[1]['roles'] = ['database','agent']
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect{ peconf.send(:the_host_with_role, 'database') }.to raise_error(ArgumentError)
+    end
+
+    it 'raises an error if multiple hosts have dashboard role' do
+      mono_hosts[1]['roles'] = ['dashboard','agent']
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect{ peconf.send(:the_host_with_role, 'dashboard') }.to raise_error(ArgumentError)
+    end
+
+    it 'raises no error if multiple hosts have database role and flag is passed in' do
+      mono_hosts[1]['roles'] = ['database','agent']
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'database', raise_error=false)).to eq(mono_basic_hosts[0])
+    end
+
+    it 'returns postgres node in monolithic if pe_postgres is set as a role' do
+      mono_hosts[1]['roles'] = ['pe_postgres','agent']
+      peconf = BeakerAnswers::PeConf.new(mono_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'pe_postgres')).to eq(mono_basic_hosts[1])
+    end
+
+    it 'returns postgres node in split if pe_postgres is set as a role' do
+      split_hosts[3]['roles'] = ['pe_postgres','agent']
+      peconf = BeakerAnswers::PeConf.new(split_hosts, "1.0")
+      expect(peconf.send(:the_host_with_role, 'pe_postgres')).to eq(split_basic_hosts[3])
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-answers
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Puppetlabs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Answer generation for PE Installation!