diff options
| author | mail_redacted_for_web | 2015-10-28 13:16:36 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-10-28 13:16:36 -0700 |
| commit | b6351f9e5d80bbf93374575591e8a95ad07c255d (patch) | |
| tree | 7faf0c170ecd77fe9774319267be14f06214e25c /site/profile/manifests | |
| parent | 591f9b9f0b262fa7a3099c81aace527e09fbbd0b (diff) | |
| download | control-repo-template-b6351f9e5d80bbf93374575591e8a95ad07c255d.tar.bz2 | |
Add $::fqdn to post receive hook title
Also, change other references of $fqdn to $::fqdn
Diffstat (limited to 'site/profile/manifests')
| -rw-r--r-- | site/profile/manifests/puppetmaster.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp index 8e0817c..5c9b59a 100644 --- a/site/profile/manifests/puppetmaster.pp +++ b/site/profile/manifests/puppetmaster.pp @@ -26,7 +26,7 @@ class profile::puppetmaster { if $git_management_system in ['gitlab', 'github'] { - git_deploy_key { "add_deploy_key_to_puppet_control-${fqdn}": + git_deploy_key { "add_deploy_key_to_puppet_control-${::fqdn}": ensure => present, name => $::fqdn, path => "${r10k_ssh_key_file}.pub", @@ -36,9 +36,9 @@ class profile::puppetmaster { provider => $git_management_system, } - git_webhook { 'web_post_receive_webhook' : + git_webhook { "web_post_receive_webhook-${::fqdn}" : ensure => present, - webhook_url => "http://${fqdn}:8088/payload", + webhook_url => "http://${::fqdn}:8088/payload", token => hiera('gms_api_token'), project_name => 'puppet/control-repo', server_url => hiera('gms_server_url'), |