Skip to content

Allow for a puppet-specific configfile #1446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

Allow for a puppet-specific configfile #1446

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96c9738
Allow for a puppet-specific configfile
Heidistein Oct 27, 2021
060977c
fix robocup warning
Heidistein Oct 29, 2021
67340fd
Merge branch 'puppetlabs:main' into main
Heidistein Nov 8, 2021
36af7ca
Merge branch 'puppetlabs:main' into main
Heidistein Nov 15, 2021
29c4af4
Merge branch 'puppetlabs:main' into main
Heidistein Dec 2, 2021
11ec39b
Merge branch 'puppetlabs:main' into main
Heidistein Mar 21, 2022
8a9a04f
Merge branch 'puppetlabs:main' into main
Heidistein May 25, 2022
c6a17d4
Merge branch 'main' into main
LukasAud Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/puppet/provider/mysql.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ def self.defaults_file
"--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf" if File.file?("#{Facter.value(:root_home)}/.my.cnf")
end

# Optional puppet-defaults file
def self.puppet_defaults_file
"--defaults-file=#{Facter.value(:root_home)}/.my.puppet.cnf" if File.file?("#{Facter.value(:root_home)}/.my.puppet.cnf")
Copy link
Collaborator

Choose a reason for hiding this comment

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

is there a reason for the my.puppet.cnf filename? is that something that should be configureable / why can't you use the .mylogin.cnf? do you create the .my.puppet.cnf via puppet?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, no this cant be configurable, because it is used in a type, which is before hiera. I really which it would be possible to configure.
The .mylogin.cnf is only available on mysql, and not mariadb.

If you want, another possibility could be to not use a different file, but the --login-path command line option. I would need to test this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

answering all questions: the filename is just chosen by looking at the stars, correlating it with average windspeed during my dogwalk. I personally create the file using puppet, most would. Should i hack this into the module to do it for us? There is a chance that users of this file would want to add mysterious and unforseen options to it.

end

def self.mysqld_type
# find the mysql "dialect" like mariadb / mysql etc.
mysqld_version_string.scan(%r{mariadb}i) { return 'mariadb' }
Expand Down Expand Up @@ -101,18 +106,26 @@ def defaults_file
self.class.defaults_file
end

def puppet_defaults_file
self.class.puppet_defaults_file
end

def self.mysql_caller(text_of_sql, type)
if type.eql? 'system'
if File.file?("#{Facter.value(:root_home)}/.mylogin.cnf")
ENV['MYSQL_TEST_LOGIN_FILE'] = "#{Facter.value(:root_home)}/.mylogin.cnf"
mysql_raw([system_database, '-e', text_of_sql].flatten.compact).scrub
elsif File.file?("#{Facter.value(:root_home)}/.my.puppet.cnf")
mysql_raw([puppet_defaults_file, system_database, '-e', text_of_sql].flatten.compact).scrub
else
mysql_raw([defaults_file, system_database, '-e', text_of_sql].flatten.compact).scrub
end
elsif type.eql? 'regular'
if File.file?("#{Facter.value(:root_home)}/.mylogin.cnf")
ENV['MYSQL_TEST_LOGIN_FILE'] = "#{Facter.value(:root_home)}/.mylogin.cnf"
mysql_raw(['-NBe', text_of_sql].flatten.compact).scrub
elsif File.file?("#{Facter.value(:root_home)}/.my.puppet.cnf")
mysql_raw([puppet_defaults_file, '-NBe', text_of_sql].flatten.compact).scrub
else
mysql_raw([defaults_file, '-NBe', text_of_sql].flatten.compact).scrub
end
Expand Down