From: Peter Palfrader Date: Sun, 8 Sep 2019 08:44:57 +0000 (+0200) Subject: Upgrade some notifies to warnings X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=2675f35ffcbd2e02cf6dc68d97f186627ad634eb;hp=2a425a85aee59abba7f8de4b9bb6f61824938d82;p=mirror%2Fdsa-puppet.git Upgrade some notifies to warnings --- diff --git a/modules/ssh/manifests/authorized_key_add.pp b/modules/ssh/manifests/authorized_key_add.pp index 4f3e1043a..2165b0f0a 100644 --- a/modules/ssh/manifests/authorized_key_add.pp +++ b/modules/ssh/manifests/authorized_key_add.pp @@ -42,7 +42,9 @@ define ssh::authorized_key_add( | EOF } } else { - notify{ "Warning, ssh key for ${name}, ${target_user} not defined (yet?).": } + notify { "Warning, ssh key for ${name}, ${target_user} not defined (yet?).": + loglevel => warning, + } } @@ferm::rule { "ssh-${raw_tags[0]}_${target_user}-${name}_from_${::hostname}": diff --git a/modules/ssh/manifests/keygen.pp b/modules/ssh/manifests/keygen.pp index 29fd063be..0af33418c 100644 --- a/modules/ssh/manifests/keygen.pp +++ b/modules/ssh/manifests/keygen.pp @@ -3,7 +3,9 @@ define ssh::keygen( String $user = $name, ) { if $facts["${user}_user_exists"] == undef { - notify{"We do not have facters for user ${user} existance and keys -- add it to modules/debian_org/lib/facter/roleaccounts.rb": } + notify { "We do not have facters for user ${user} existance and keys -- add it to modules/debian_org/lib/facter/roleaccounts.rb": + loglevel => warning, + } } elsif $facts["${user}_user_exists"] { if ! $facts["${user}_key"] { exec { "create-${user}-ssh-key": @@ -14,6 +16,8 @@ define ssh::keygen( } } } else { - notify{"User ${user} does not exist on this host. Will not create ssh key": } + notify { "User ${user} does not exist on this host. Will not create ssh key": + loglevel => warning, + } } }