From 34de47281d79fd2cfdd5ce8a62aa43442e494125 Mon Sep 17 00:00:00 2001 From: Kyrylo Galanov Date: Thu, 15 Oct 2015 15:43:50 +0300 Subject: [PATCH] Disable launching etckeeper each puppet run etckeeper is not installed or configured on deployed nodes, so it should be replaced with a dummy command that will return 0 Change-Id: I0ced09f9cedcdb81eb3281168fed8b15f61d1e99 Closes-bug: #1504191 --- cloud-init-templates/cloud_config_centos.jinja2 | 2 ++ cloud-init-templates/cloud_config_ubuntu.jinja2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cloud-init-templates/cloud_config_centos.jinja2 b/cloud-init-templates/cloud_config_centos.jinja2 index 717a9ce..8817b5d 100644 --- a/cloud-init-templates/cloud_config_centos.jinja2 +++ b/cloud-init-templates/cloud_config_centos.jinja2 @@ -93,6 +93,8 @@ puppet: rundir: /var/run/puppet ssldir: $vardir/ssl pluginsync: true + prerun_command: /bin/true + postrun_command: /bin/true agent: classfile: $vardir/classes.txt localconfig: $vardir/localconfig diff --git a/cloud-init-templates/cloud_config_ubuntu.jinja2 b/cloud-init-templates/cloud_config_ubuntu.jinja2 index 61e6758..2a09d0a 100644 --- a/cloud-init-templates/cloud_config_ubuntu.jinja2 +++ b/cloud-init-templates/cloud_config_ubuntu.jinja2 @@ -78,6 +78,8 @@ puppet: rundir: /var/run/puppet ssldir: $vardir/ssl pluginsync: true + prerun_command: /bin/true + postrun_command: /bin/true agent: classfile: $vardir/classes.txt localconfig: $vardir/localconfig