Skip to content
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.

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

Dont print root #739

Merged
merged 3 commits into from Aug 3, 2015
Merged

Dont print root #739

merged 3 commits into from Aug 3, 2015

Conversation

hunner
Copy link
Contributor

@hunner hunner commented Aug 3, 2015

From #716 and #732

tphoney and others added 3 commits June 29, 2015 16:43
puppet 2.7 doesnt support show_diff

hash alignment
For puppet versions that support it, suppress diffing root's password.
(maint) don't print diff root password in diff
bmjen added a commit that referenced this pull request Aug 3, 2015
@bmjen bmjen merged commit f0a064a into puppetlabs:master Aug 3, 2015
@hunner hunner deleted the dont_print_root branch August 3, 2015 22:27
}
}
# show_diff was added with puppet 3.0
if versioncmp($::puppetversion, '3.0') <= 0 {
Copy link

Choose a reason for hiding this comment

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

Shouldn't this part suffice then? Thus like this:

file { "${::root_home}/.my.cnf":
  content => template('mysql/my.cnf.pass.erb'),
  owner   => 'root',
  mode    => '0600',
}
if versioncmp($::puppetversion, '3.0') <= 0 {
  File["${::root_home}/.my.cnf"] { show_diff => false }
}

@agadelshin
Copy link
Contributor

Hello. This PR contains duplicate show_diff => false for versioncmp($::puppetversion, '3.0') <= 0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants