summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2017-01-12 14:14:56 -0500
committerPaul Belanger <pabelanger@redhat.com>2017-01-12 14:14:56 -0500
commitedb0e245d59eb43627dd67cbe17127b7e7479d8d (patch)
treee088d6a3b26fa5f0e57288b3a7671577520032ef
parent8d0f0bfd0a7288b4bdc2782ed2d1dcf626e8a3ba (diff)
Expose puppet_timeout variable
It is possible we want our puppet role to run longer then 30mins, expose the ability for a user to change it. Change-Id: Id42ba80a5118a9f93e45619ac6ecc5baa774549a Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Ian Wienand <iwienand@redhat.com> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 13 Jan 2017 16:41:16 +0000 Reviewed-on: https://review.openstack.org/419615 Project: openstack-infra/ansible-role-puppet Branch: refs/heads/master
-rw-r--r--defaults/main.yml1
-rw-r--r--tasks/main.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/defaults/main.yml b/defaults/main.yml
index 5dbb131..9411169 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,3 +15,4 @@ puppet_environmentpath: '$confdir/environments'
15puppet_hiera_datadir: '/opt/system-config/' 15puppet_hiera_datadir: '/opt/system-config/'
16puppet_environment_basedir: '/opt/system-config/' 16puppet_environment_basedir: '/opt/system-config/'
17puppet_environment: production 17puppet_environment: production
18puppet_timeout: 30m
diff --git a/tasks/main.yml b/tasks/main.yml
index 0836240..3041cb0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -66,6 +66,7 @@
66 environment: "{{ puppet_environment|default(omit) }}" 66 environment: "{{ puppet_environment|default(omit) }}"
67 noop: "{{ puppet_noop|default(omit) }}" 67 noop: "{{ puppet_noop|default(omit) }}"
68 debug: "{{ puppet_debug|default(omit) }}" 68 debug: "{{ puppet_debug|default(omit) }}"
69 timeout: "{{ puppet_timeout|default(omit) }}"
69- always: 70- always:
70 - name: find logs 71 - name: find logs
71 shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json" 72 shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json"