From 5c1b663f30e76bfabfb10b48663955836d5de57b Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 11 Sep 2014 10:47:11 -0700 Subject: [PATCH] Plumb puppetmaster through ansible task The previous change to make the puppetmaster configurable in the ansible playbook omitted passing through the parameter in the task. Also, add the parameter to the module docs. Change-Id: I6bcd58803fd11c3d64608ea1d9fca269042936b4 --- modules/ansible/files/library/config_management/puppet | 4 ++++ modules/ansible/files/roles/puppet/tasks/main.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/ansible/files/library/config_management/puppet b/modules/ansible/files/library/config_management/puppet index 0b429c4ae8..92407ae442 100644 --- a/modules/ansible/files/library/config_management/puppet +++ b/modules/ansible/files/library/config_management/puppet @@ -30,6 +30,10 @@ options: - How long to wait for I(puppet) to finish. required: false default: 30m + puppetmaster: + description: + - The hostname of the puppetmaster to contact. + required: true show_diff: description: - Should puppet return diffs of changes applied. Defaults to off to avoid leaking secret changes by default. diff --git a/modules/ansible/files/roles/puppet/tasks/main.yml b/modules/ansible/files/roles/puppet/tasks/main.yml index b799b2e007..b2fe93a887 100644 --- a/modules/ansible/files/roles/puppet/tasks/main.yml +++ b/modules/ansible/files/roles/puppet/tasks/main.yml @@ -1,3 +1,4 @@ --- - name: run puppet puppet: + puppetmaster: "{{puppetmaster}}"