aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--environments/production/data/common.yaml12
-rw-r--r--environments/production/data/types/vps-ovhssd-1.yaml3
-rw-r--r--environments/production/hiera.yaml19
-rw-r--r--modules/base_installation/manifests/params.pp14
4 files changed, 41 insertions, 7 deletions
diff --git a/environments/production/data/common.yaml b/environments/production/data/common.yaml
new file mode 100644
index 0000000..e129d47
--- /dev/null
+++ b/environments/production/data/common.yaml
@@ -0,0 +1,12 @@
1---
2base_installation::puppet_code_path: "/etc/puppetlabs/code"
3base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"]
4base_installation::system_timezone: "Europe/Paris"
5base_installation::system_users:
6 - userid: 1000
7 username: "immae"
8 groups: ["wheel"]
9 keys:
10 - host: "immae.eu"
11 key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v"
12 key_type: "ssh-rsa"
diff --git a/environments/production/data/types/vps-ovhssd-1.yaml b/environments/production/data/types/vps-ovhssd-1.yaml
new file mode 100644
index 0000000..72f3820
--- /dev/null
+++ b/environments/production/data/types/vps-ovhssd-1.yaml
@@ -0,0 +1,3 @@
1---
2base_installation::system_hostname: "new.immae.eu"
3base_installation::grub_device: "/dev/sdb"
diff --git a/environments/production/hiera.yaml b/environments/production/hiera.yaml
new file mode 100644
index 0000000..095a110
--- /dev/null
+++ b/environments/production/hiera.yaml
@@ -0,0 +1,19 @@
1---
2version: 5
3
4defaults:
5 datadir: data
6 data_hash: yaml_data
7
8hierarchy:
9 - name: "Per-node data"
10 path: "nodes/%{facts.ec2_metadata.hostname}.yaml"
11
12 - name: "Per-role data"
13 mapped_paths: [roles, role, "roles/%{role}.yaml"]
14
15 - name: "Per-type data"
16 path: "types/%{facts.ec2_metadata.instance-type}.yaml"
17
18 - name: "Common data"
19 path: "common.yaml"
diff --git a/modules/base_installation/manifests/params.pp b/modules/base_installation/manifests/params.pp
index 5f2e298..f09f01a 100644
--- a/modules/base_installation/manifests/params.pp
+++ b/modules/base_installation/manifests/params.pp
@@ -1,18 +1,18 @@
1class base_installation::params { 1class base_installation::params {
2 $puppet_code_path = "/etc/puppetlabs/code" 2 $puppet_code_path = "/etc/puppetlabs/code"
3 $grub_device = "/dev/sda" 3 $grub_device = "/dev/sda"
4 $system_hostname = "new.immae.eu" 4 $system_hostname = "example.com"
5 $system_locales = ["fr_FR.UTF-8", "en_US.UTF-8"] 5 $system_locales = ["en_US.UTF-8"]
6 $system_timezone = "Europe/Paris" 6 $system_timezone = "UTC"
7 $system_users = [ 7 $system_users = [
8 { 8 {
9 userid => 1000, 9 userid => 1000,
10 username => "immae", 10 username => "example",
11 groups => ["wheel"], 11 groups => ["sudo"],
12 keys => [ 12 keys => [
13 { 13 {
14 host => "immae.eu", 14 host => "local.example.com",
15 key => "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v", 15 key => "AAAAB3",
16 key_type => "ssh-rsa" 16 key_type => "ssh-rsa"
17 } 17 }
18 ] 18 ]