From 2d02240aaac30d65e47de15198853fc95e32411b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 8 Aug 2016 19:36:21 +0200 Subject: [PATCH] Add stdlib module --- .gitmodules | 3 +++ manifests/site.pp | 1 + modules/cron_puppet/files/post-merge | 1 + modules/stdlib | 1 + 4 files changed, 6 insertions(+) create mode 100644 .gitmodules create mode 160000 modules/stdlib diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e090332 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "modules/stdlib"] + path = modules/stdlib + url = https://github.com/puppetlabs/puppetlabs-stdlib.git diff --git a/manifests/site.pp b/manifests/site.pp index 45b7c01..0c7fdf4 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1,4 +1,5 @@ node default { + include stdlib class { 'ovh_cleanup': } class { 'base_packages': } class { 'cron_puppet': } diff --git a/modules/cron_puppet/files/post-merge b/modules/cron_puppet/files/post-merge index 7310b98..1ba08fb 100644 --- a/modules/cron_puppet/files/post-merge +++ b/modules/cron_puppet/files/post-merge @@ -1,5 +1,6 @@ #!/bin/bash -e ## Run Puppet locally using puppet apply +git submodule update --init /usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp ## Log status of the Puppet run diff --git a/modules/stdlib b/modules/stdlib new file mode 160000 index 0000000..e39fe01 --- /dev/null +++ b/modules/stdlib @@ -0,0 +1 @@ +Subproject commit e39fe01ea01719b97110341cacc4b4e2784a7d1a -- 2.41.0