Skip to content

Conversation

bastelfreak
Copy link
Member

No description provided.

Comment on lines +134 to +135
$puppetdb_package = inline_epp('openvoxdb<%= $puppetdb::params::puppetdb_major_version %>')
$terminus_package = inline_epp('openvoxdb-terminus<%= $puppetdb::params::puppetdb_major_version %>')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this existed before, but isn't this equivalent to:

Suggested change
$puppetdb_package = inline_epp('openvoxdb<%= $puppetdb::params::puppetdb_major_version %>')
$terminus_package = inline_epp('openvoxdb-terminus<%= $puppetdb::params::puppetdb_major_version %>')
$puppetdb_package = "openvoxdb-${puppetdb::params::puppetdb_major_version}"
$terminus_package = "openvoxdb-terminus-${puppetdb::params::puppetdb_major_version}"

match => '^PIDFile.*',
append_on_no_match => false,
require => Package['puppetdb'],
require => Package['openvoxdb'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we dropped PIDFile from our services in OpenVoxProject/ezbake@b2de7c7 so I think this whole workaround may no longer be needed.

port: params[:database_port].to_i,
encoding: 'UTF8',
locale: 'en_US.UTF-8'
locale: 'C.UTF-8'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This belongs in the other patch where the locale is changed.

package { $puppetserver_package:
ensure => installed,
}
# savagely disable dropsonde
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't ship dropsonde in our packages so this shouldn't be needed.

match => '^PIDFile.*',
append_on_no_match => false,
require => Package['puppetserver'],
require => Package['openvox-server'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need this workaround anymore.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants