aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2017-08-29 23:58:30 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2017-08-31 00:44:49 +0200
commit1508e956adaa97b7a82c27537f4b124266dacdf0 (patch)
tree1705ef0d5108069fdd71673c2c21519da6d6781e
parent0b62a18bd9fc4ecd614526a9c0e3f1f17e2ce4fe (diff)
downloadPuppet-1508e956adaa97b7a82c27537f4b124266dacdf0.tar.gz
Puppet-1508e956adaa97b7a82c27537f4b124266dacdf0.tar.zst
Puppet-1508e956adaa97b7a82c27537f4b124266dacdf0.zip
Move classes to hiera
-rw-r--r--environments/production/data/common.yaml3
-rw-r--r--environments/production/data/types/vps-ovhssd-1.yaml4
-rw-r--r--manifests/install_ovh_from_scratch.pp8
-rw-r--r--manifests/site.pp12
4 files changed, 19 insertions, 8 deletions
diff --git a/environments/production/data/common.yaml b/environments/production/data/common.yaml
index e129d47..01bbcac 100644
--- a/environments/production/data/common.yaml
+++ b/environments/production/data/common.yaml
@@ -1,4 +1,7 @@
1--- 1---
2classes:
3 stdlib: ~
4
2base_installation::puppet_code_path: "/etc/puppetlabs/code" 5base_installation::puppet_code_path: "/etc/puppetlabs/code"
3base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] 6base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"]
4base_installation::system_timezone: "Europe/Paris" 7base_installation::system_timezone: "Europe/Paris"
diff --git a/environments/production/data/types/vps-ovhssd-1.yaml b/environments/production/data/types/vps-ovhssd-1.yaml
index 72f3820..eb4934b 100644
--- a/environments/production/data/types/vps-ovhssd-1.yaml
+++ b/environments/production/data/types/vps-ovhssd-1.yaml
@@ -1,3 +1,7 @@
1--- 1---
2classes:
3 base_installation:
4 stage: "setup"
5
2base_installation::system_hostname: "new.immae.eu" 6base_installation::system_hostname: "new.immae.eu"
3base_installation::grub_device: "/dev/sdb" 7base_installation::grub_device: "/dev/sdb"
diff --git a/manifests/install_ovh_from_scratch.pp b/manifests/install_ovh_from_scratch.pp
deleted file mode 100644
index f5224fa..0000000
--- a/manifests/install_ovh_from_scratch.pp
+++ /dev/null
@@ -1,8 +0,0 @@
1node default {
2 include stdlib
3
4 class { 'base_installation':
5 stage => "setup",
6 grub_device => "/dev/sdb",
7 }
8}
diff --git a/manifests/site.pp b/manifests/site.pp
new file mode 100644
index 0000000..f922d2b
--- /dev/null
+++ b/manifests/site.pp
@@ -0,0 +1,12 @@
1node default {
2 lookup('classes', Hash, 'deep').each |$class_name, $class_hash| {
3 if empty($class_hash) {
4 include $class_name
5 } else {
6 class { $class_name:
7 * => $class_hash
8 }
9 }
10
11 }
12}