aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
-rw-r--r--manifests/site.pp1
-rw-r--r--modules/cron_puppet/files/post-merge1
m---------modules/stdlib0
4 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e090332
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
1[submodule "modules/stdlib"]
2 path = modules/stdlib
3 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 @@
1node default { 1node default {
2 include stdlib
2 class { 'ovh_cleanup': } 3 class { 'ovh_cleanup': }
3 class { 'base_packages': } 4 class { 'base_packages': }
4 class { 'cron_puppet': } 5 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 @@
1#!/bin/bash -e 1#!/bin/bash -e
2## Run Puppet locally using puppet apply 2## Run Puppet locally using puppet apply
3git submodule update --init
3/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp 4/usr/bin/puppet apply --modulepath=/etc/puppetlabs/puppet/modules /etc/puppetlabs/puppet/manifests/site.pp
4 5
5## Log status of the Puppet run 6## Log status of the Puppet run
diff --git a/modules/stdlib b/modules/stdlib
new file mode 160000
Subproject e39fe01ea01719b97110341cacc4b4e2784a7d1