git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormail_redacted_for_web 2016-01-12 09:32:06 -0800
committermail_redacted_for_web 2016-01-12 09:32:06 -0800
commit3f22ce0ae7fe650a178551bb3ac73b24d7e79c79 (patch)
tree233496699ca58bb832d96ded7b21960de10458ac
parent323b4b9386191c0f0761f03267f7eab840740227 (diff)
downloadcontrol-repo-template-3f22ce0ae7fe650a178551bb3ac73b24d7e79c79.tar.bz2
Fix hostname on role creation curl command
Prior to the this commit, if you were using the code_manager profile on a split install it would incorrectly try to curl the NC api on the master node. After this commit, it should correctly curl the hostname of the NC This has no impact on the functionality of the code on a monolithic PE installation.
-rw-r--r--site/profile/manifests/git_webhook/code_manager.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/site/profile/manifests/git_webhook/code_manager.pp b/site/profile/manifests/git_webhook/code_manager.pp
index 7470e1c..41c9e16 100644
--- a/site/profile/manifests/git_webhook/code_manager.pp
+++ b/site/profile/manifests/git_webhook/code_manager.pp
@@ -39,7 +39,7 @@ class profile::git_webhook::code_manager {
$create_role_creates_file = '/etc/puppetlabs/puppetserver/.puppetlabs/deploy_environments_created'
$create_role_curl = @(EOT)
/opt/puppetlabs/puppet/bin/curl -k -X POST -H 'Content-Type: application/json' \
- https://<%= $::trusted['certname'] %>:4433/rbac-api/v1/roles \
+ https://<%= $classifier_hostname %>:4433/rbac-api/v1/roles \
-d '{"permissions": [{"object_type": "environment", "action": "deploy_code", "instance": "*"},
{"object_type": "tokens", "action": "override_lifetime", "instance": "*"}],"user_ids": [], "group_ids": [], "display_name": "<%= $code_manager_role_name %>", "description": ""}' \
--cert <%= $::settings::certdir %>/<%= $::trusted['certname'] %>.pem \