aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-13 10:20:17 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-13 11:15:08 +0100
commita869ea173f9a1e45f63336ad9d640bf94e5039e3 (patch)
tree2fd1df3a6c0c34b87499b2606e0cd45faf5e6861
parent56bc60ea5e9ae11872d3e3d388adb7c5ada0c2c9 (diff)
downloadPuppet-a869ea173f9a1e45f63336ad9d640bf94e5039e3.tar.gz
Puppet-a869ea173f9a1e45f63336ad9d640bf94e5039e3.tar.zst
Puppet-a869ea173f9a1e45f63336ad9d640bf94e5039e3.zip
Refactor hiera environments
-rw-r--r--environments/global/common.yaml (renamed from environments/integration/data/common.yaml)12
-rw-r--r--environments/global/roles/cryptoportfolio.yaml4
-rw-r--r--environments/global/types/s1-2.yaml (renamed from environments/production/data/types/s1-2.yaml)0
-rw-r--r--environments/global/types/vps-ovhssd-1.yaml (renamed from environments/integration/data/types/vps-ovhssd-1.yaml)0
-rw-r--r--environments/hiera.yaml32
l---------[-rw-r--r--]environments/integration/hiera.yaml20
-rw-r--r--environments/integration/roles/cryptoportfolio.yaml (renamed from environments/integration/data/roles/cryptoportfolio.yaml)3
-rw-r--r--environments/production/data/common.yaml26
-rw-r--r--environments/production/data/types/vps-ovhssd-1.yaml10
l---------[-rw-r--r--]environments/production/hiera.yaml20
-rw-r--r--environments/production/roles/cryptoportfolio.yaml (renamed from environments/production/data/roles/cryptoportfolio.yaml)3
11 files changed, 50 insertions, 80 deletions
diff --git a/environments/integration/data/common.yaml b/environments/global/common.yaml
index 78cce6b..5b21dca 100644
--- a/environments/integration/data/common.yaml
+++ b/environments/global/common.yaml
@@ -1,4 +1,12 @@
1--- 1---
2lookup_options:
3 base_installation::mounts:
4 merge: unique
5 classes:
6 merge: deep
7 base_installation::system_users:
8 merge: unique
9
2classes: 10classes:
3 stdlib: ~ 11 stdlib: ~
4 12
@@ -7,6 +15,10 @@ base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae
7base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" 15base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}"
8base_installation::ldap_server: "ldap.immae.eu" 16base_installation::ldap_server: "ldap.immae.eu"
9base_installation::ldap_uri: "ldaps://ldap.immae.eu" 17base_installation::ldap_uri: "ldaps://ldap.immae.eu"
18# FIXME: get all mounts without needing that hack?
19base_installation::mounts:
20 - "%{facts.ldapvar.self.vars.mounts.0}"
21 - "%{facts.ldapvar.self.vars.mounts.1}"
10base_installation::puppet_conf_path: "/etc/puppetlabs/puppet" 22base_installation::puppet_conf_path: "/etc/puppetlabs/puppet"
11base_installation::puppet_code_path: "/etc/puppetlabs/code" 23base_installation::puppet_code_path: "/etc/puppetlabs/code"
12base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" 24base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed"
diff --git a/environments/global/roles/cryptoportfolio.yaml b/environments/global/roles/cryptoportfolio.yaml
new file mode 100644
index 0000000..3d36e71
--- /dev/null
+++ b/environments/global/roles/cryptoportfolio.yaml
@@ -0,0 +1,4 @@
1---
2classes:
3 role::cryptoportfolio: ~
4cryptoportfolio::slack_webhook: "%{ldapvar.self.vars.cf_slack_webhook.0}"
diff --git a/environments/production/data/types/s1-2.yaml b/environments/global/types/s1-2.yaml
index 496b741..496b741 100644
--- a/environments/production/data/types/s1-2.yaml
+++ b/environments/global/types/s1-2.yaml
diff --git a/environments/integration/data/types/vps-ovhssd-1.yaml b/environments/global/types/vps-ovhssd-1.yaml
index 73f7a45..73f7a45 100644
--- a/environments/integration/data/types/vps-ovhssd-1.yaml
+++ b/environments/global/types/vps-ovhssd-1.yaml
diff --git a/environments/hiera.yaml b/environments/hiera.yaml
new file mode 100644
index 0000000..5a9a6d6
--- /dev/null
+++ b/environments/hiera.yaml
@@ -0,0 +1,32 @@
1---
2version: 5
3
4defaults:
5 datadir: .
6 data_hash: yaml_data
7
8hierarchy:
9 - name: "Initialization variables"
10 path: "/root/puppet_variables.json"
11
12 - name: "Per-role environment data"
13 mapped_paths: [ldapvar.self.vars.roles, role, "roles/%{role}.yaml"]
14
15 - name: "Per-role global data"
16 mapped_paths: [ldapvar.self.vars.roles, role, "roles/%{role}.yaml"]
17 datadir: ../global
18
19 - name: "Per-type environment data"
20 path: "types/%{facts.ec2_metadata.instance-type}.yaml"
21
22 - name: "Per-type global data"
23 path: "types/%{facts.ec2_metadata.instance-type}.yaml"
24 datadir: ../global
25
26 - name: "Common environment data"
27 path: "common.yaml"
28
29 - name: "Common global data"
30 path: "common.yaml"
31 datadir: ../global
32
diff --git a/environments/integration/hiera.yaml b/environments/integration/hiera.yaml
index a63fc92..91d9bbf 100644..120000
--- a/environments/integration/hiera.yaml
+++ b/environments/integration/hiera.yaml
@@ -1,19 +1 @@
1--- ../hiera.yaml \ No newline at end of file
2version: 5
3
4defaults:
5 datadir: data
6 data_hash: yaml_data
7
8hierarchy:
9 - name: "Initialization variables"
10 path: "/root/puppet_variables.json"
11
12 - name: "Per-role data"
13 mapped_paths: [ldapvar.self.vars.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/environments/integration/data/roles/cryptoportfolio.yaml b/environments/integration/roles/cryptoportfolio.yaml
index 4630738..9825bce 100644
--- a/environments/integration/data/roles/cryptoportfolio.yaml
+++ b/environments/integration/roles/cryptoportfolio.yaml
@@ -1,8 +1,5 @@
1--- 1---
2classes:
3 role::cryptoportfolio: ~
4cryptoportfolio::front_version: v0.0.2-3-g6200f9a 2cryptoportfolio::front_version: v0.0.2-3-g6200f9a
5cryptoportfolio::front_sha256: 69d31251ecd4fcea46d93dfee0184b1171019a765b6744b84f6eec6b10e5818f 3cryptoportfolio::front_sha256: 69d31251ecd4fcea46d93dfee0184b1171019a765b6744b84f6eec6b10e5818f
6cryptoportfolio::bot_version: v0.5-8-g34eb08f 4cryptoportfolio::bot_version: v0.5-8-g34eb08f
7cryptoportfolio::bot_sha256: f5b99c4a1cc4db0228f757705a5a909aa301e42787bc5842f8ba442fec0d3fd1 5cryptoportfolio::bot_sha256: f5b99c4a1cc4db0228f757705a5a909aa301e42787bc5842f8ba442fec0d3fd1
8cryptoportfolio::slack_webhook: "%{ldapvar.self.vars.cf_slack_webhook.0}"
diff --git a/environments/production/data/common.yaml b/environments/production/data/common.yaml
deleted file mode 100644
index 1b4f38d..0000000
--- a/environments/production/data/common.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
1---
2classes:
3 stdlib: ~
4
5base_installation::ldap_base: "dc=immae,dc=eu"
6base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae,dc=eu"
7base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}"
8base_installation::ldap_server: "ldap.immae.eu"
9base_installation::ldap_uri: "ldaps://ldap.immae.eu"
10base_installation::mounts: "%{alias('facts.ldapvar.self.vars.mounts')}"
11base_installation::puppet_conf_path: "/etc/puppetlabs/puppet"
12base_installation::puppet_code_path: "/etc/puppetlabs/code"
13base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed"
14base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl"
15base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"]
16base_installation::system_timezone: "Europe/Paris"
17base_installation::system_users:
18 - userid: 1000
19 username: "immae"
20 groups: ["wheel"]
21 keys:
22 - host: "immae.eu"
23 key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v"
24 key_type: "ssh-rsa"
25xmr_stak::mining_pool: "pool.minexmr.com:7777"
26xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo"
diff --git a/environments/production/data/types/vps-ovhssd-1.yaml b/environments/production/data/types/vps-ovhssd-1.yaml
deleted file mode 100644
index 73f7a45..0000000
--- a/environments/production/data/types/vps-ovhssd-1.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
1---
2classes:
3 base_installation:
4 stage: "setup"
5
6base_installation::system_hostname: "%{ldapvar.self.vars.host.0}"
7base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net"
8base_installation::grub_device: "/dev/sdb"
9base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt"
10ssl::try_letsencrypt_for_real_hostname: false
diff --git a/environments/production/hiera.yaml b/environments/production/hiera.yaml
index a63fc92..91d9bbf 100644..120000
--- a/environments/production/hiera.yaml
+++ b/environments/production/hiera.yaml
@@ -1,19 +1 @@
1--- ../hiera.yaml \ No newline at end of file
2version: 5
3
4defaults:
5 datadir: data
6 data_hash: yaml_data
7
8hierarchy:
9 - name: "Initialization variables"
10 path: "/root/puppet_variables.json"
11
12 - name: "Per-role data"
13 mapped_paths: [ldapvar.self.vars.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/environments/production/data/roles/cryptoportfolio.yaml b/environments/production/roles/cryptoportfolio.yaml
index 014df5a..c9328e1 100644
--- a/environments/production/data/roles/cryptoportfolio.yaml
+++ b/environments/production/roles/cryptoportfolio.yaml
@@ -1,8 +1,5 @@
1--- 1---
2classes:
3 role::cryptoportfolio: ~
4cryptoportfolio::front_version: v0.0.2-3-g6200f9a 2cryptoportfolio::front_version: v0.0.2-3-g6200f9a
5cryptoportfolio::front_sha256: 69d31251ecd4fcea46d93dfee0184b1171019a765b6744b84f6eec6b10e5818f 3cryptoportfolio::front_sha256: 69d31251ecd4fcea46d93dfee0184b1171019a765b6744b84f6eec6b10e5818f
6cryptoportfolio::bot_version: v0.5.1 4cryptoportfolio::bot_version: v0.5.1
7cryptoportfolio::bot_sha256: 733789711365b2397bd996689af616a6789207d26c71a31ad1af68620b267d54 5cryptoportfolio::bot_sha256: 733789711365b2397bd996689af616a6789207d26c71a31ad1af68620b267d54
8cryptoportfolio::slack_webhook: "%{ldapvar.self.vars.cf_slack_webhook.0}"