Skip to content

Commit 4250c2d

Browse files
authored
Merge pull request #258 from OpenVoxProject/cicleanup
CI: Switch from puppetlabs/puppetdb -> puppet/openvoxdb
2 parents 546c13c + a3b642b commit 4250c2d

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

acceptance/helper.rb

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ def get_package_version(host, version = nil)
452452
end
453453

454454
def install_puppetdb_module(hosts, puppet_platform)
455-
on(hosts, 'puppet module install puppetlabs-puppetdb')
455+
on(hosts, 'puppet module install puppet-openvoxdb')
456456
end
457457

458458
def setup_openvoxdb_certs(database)
@@ -479,7 +479,7 @@ def setup_openvoxdb_certs(database)
479479
# and packages.
480480
def configure_openvoxdb(host)
481481
manifest = <<~EOS
482-
class { 'puppetdb':
482+
class { 'openvoxdb':
483483
puppetdb_package => 'openvoxdb',
484484
manage_firewall => false,
485485
manage_package_repo => true,
@@ -501,7 +501,7 @@ class { 'puppetdb':
501501
def configure_openvoxdb_termini(host, databases)
502502
server_urls = databases.map {|db| "https://#{db.node_name}:8081"}.join(',')
503503
manifest = <<~EOS
504-
class { 'puppetdb::master::config':
504+
class { 'openvoxdb::master::config':
505505
terminus_package => 'openvoxdb-termini',
506506
puppetdb_startup_timeout => 120,
507507
manage_report_processor => true,
@@ -511,7 +511,7 @@ class { 'puppetdb::master::config':
511511
ini_setting {'server_urls':
512512
ensure => present,
513513
section => 'main',
514-
path => "${puppetdb::params::puppet_confdir}/puppetdb.conf",
514+
path => "${openvoxdb::params::puppet_confdir}/puppetdb.conf",
515515
setting => 'server_urls',
516516
value => '#{server_urls}',
517517
}
@@ -521,15 +521,15 @@ class { 'puppetdb::master::config':
521521

522522
def install_puppetdb(host, version=nil)
523523
manifest = <<-EOS
524-
class { 'puppetdb::globals':
524+
class { 'openvoxdb::globals':
525525
version => '#{get_package_version(host, version)}'
526526
}
527-
class { 'puppetdb::server':
527+
class { 'openvoxdb::server':
528528
manage_firewall => false,
529529
disable_update_checking => true,
530530
}
531531
#{postgres_manifest}
532-
Class['::puppetdb::database::postgresql'] -> Class['puppetdb::server']
532+
Class['::openvoxdb::database::postgresql'] -> Class['openvoxdb::server']
533533
EOS
534534
apply_manifest_on(host, manifest)
535535
print_ini_files(host)
@@ -542,10 +542,10 @@ def validate_package_version(host)
542542
installed_version =
543543
case os
544544
when :debian
545-
result = on host, "dpkg-query --showformat \"\\${Version}\" --show puppetdb"
545+
result = on host, "dpkg-query --showformat \"\\${Version}\" --show openvoxdb"
546546
result.stdout.strip
547547
when :redhat
548-
result = on host, "rpm -q puppetdb --queryformat \"%{VERSION}-%{RELEASE}\""
548+
result = on host, "rpm -q openvoxdb --queryformat \"%{VERSION}-%{RELEASE}\""
549549
result.stdout.strip
550550
else
551551
raise ArgumentError, "Unsupported OS family: '#{os}'"
@@ -565,10 +565,10 @@ def install_puppetdb_termini(host, databases, version=nil)
565565
# acceptance nodes (they run puppet master from the CLI).
566566
server_urls = databases.map {|db| "https://#{db.node_name}:8081"}.join(',')
567567
manifest = <<-EOS
568-
class { 'puppetdb::globals':
568+
class { 'openvoxdb::globals':
569569
version => '#{get_package_version(host, version)}'
570570
}
571-
class { 'puppetdb::master::config':
571+
class { 'openvoxdb::master::config':
572572
puppetdb_startup_timeout => 120,
573573
manage_report_processor => true,
574574
enable_reports => true,
@@ -578,7 +578,7 @@ class { 'puppetdb::master::config':
578578
ini_setting {'server_urls':
579579
ensure => present,
580580
section => 'main',
581-
path => "${puppetdb::params::puppet_confdir}/puppetdb.conf",
581+
path => "${openvoxdb::params::puppet_confdir}/puppetdb.conf",
582582
setting => 'server_urls',
583583
value => '#{server_urls}',
584584
}
@@ -631,7 +631,7 @@ def postgres_manifest
631631

632632
manifest = <<~EOS
633633
# create the puppetdb database
634-
class { '::puppetdb::database::postgresql':
634+
class { '::openvoxdb::database::postgresql':
635635
listen_addresses => 'localhost',
636636
manage_package_repo => #{manage_package_repo},
637637
postgres_version => '14',
@@ -686,7 +686,7 @@ def install_puppetdb_via_rake(host)
686686

687687
step "Configure database.ini file" do
688688
manifest = "
689-
class { 'puppetdb::server::database_ini': }"
689+
class { 'openvoxdb::server::database_ini': }"
690690

691691
apply_manifest_on(host, manifest)
692692
end
@@ -702,18 +702,18 @@ def install_puppetdb_termini_via_rake(host, databases)
702702

703703
server_urls = databases.map {|db| "https://#{db.node_name}:8081"}.join(',')
704704
manifest = <<-EOS
705-
class { 'puppetdb::globals':
705+
class { 'openvoxdb::globals':
706706
version => '#{get_package_version(host)}'
707707
}
708-
include puppetdb::master::routes
709-
include puppetdb::master::storeconfigs
710-
class { 'puppetdb::master::report_processor':
708+
include openvoxdb::master::routes
709+
include openvoxdb::master::storeconfigs
710+
class { 'openvoxdb::master::report_processor':
711711
enable => true,
712712
}
713713
ini_setting {'server_urls':
714714
ensure => present,
715715
section => 'main',
716-
path => "${puppetdb::params::puppet_confdir}/puppetdb.conf",
716+
path => "${openvoxdb::params::puppet_confdir}/puppetdb.conf",
717717
setting => 'server_urls',
718718
value => '#{server_urls}',
719719
}

0 commit comments

Comments
 (0)