aboutsummaryrefslogtreecommitdiff
path: root/environments/production
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-04 21:20:20 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2018-03-04 21:20:20 +0100
commit89c7d1dea4af6026af00624af77bb1a08c8ebd53 (patch)
tree6c3b46adcdadcd75aada126cacf0a36202f31e3e /environments/production
parenta77b768abb31be9e19563e130d763f163496477d (diff)
parentc17e63ed33a5260ea5bf0f869d7dce39676526cb (diff)
downloadPuppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.gz
Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.zst
Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.zip
Merge branch 'new_node'
Diffstat (limited to 'environments/production')
-rw-r--r--environments/production/data/nodes/vps464408.novalocal.yaml1
-rw-r--r--environments/production/data/nodes/vps494082.yaml5
-rw-r--r--environments/production/data/roles/cryptoportfolio.yaml4
-rw-r--r--environments/production/data/types/vps-ovhssd-1.yaml1
-rw-r--r--environments/production/hiera.yaml9
5 files changed, 5 insertions, 15 deletions
diff --git a/environments/production/data/nodes/vps464408.novalocal.yaml b/environments/production/data/nodes/vps464408.novalocal.yaml
deleted file mode 100644
index ad3a440..0000000
--- a/environments/production/data/nodes/vps464408.novalocal.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base_installation::system_hostname: ns2.immae.eu
diff --git a/environments/production/data/nodes/vps494082.yaml b/environments/production/data/nodes/vps494082.yaml
deleted file mode 100644
index c7d1c85..0000000
--- a/environments/production/data/nodes/vps494082.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
1base_installation::system_hostname: cryptoportfolio.immae.eu
2cryptoportfolio::front_version: v0.0.2
3cryptoportfolio::front_sha256: 2ace0197a34f9f130523eecf8a43aa4f411cdca09de33838e074f25a7e1d6c5e
4cryptoportfolio::bot_version: v0.2-4-gf70bb85
5cryptoportfolio::bot_sha256: e9850a667e0672cdd0363bb93124b59610c4d67e3ed9908b004a9d15c2276340
diff --git a/environments/production/data/roles/cryptoportfolio.yaml b/environments/production/data/roles/cryptoportfolio.yaml
index da46382..e55d15b 100644
--- a/environments/production/data/roles/cryptoportfolio.yaml
+++ b/environments/production/data/roles/cryptoportfolio.yaml
@@ -1,3 +1,7 @@
1--- 1---
2classes: 2classes:
3 role::cryptoportfolio: ~ 3 role::cryptoportfolio: ~
4cryptoportfolio::front_version: v0.0.2-3-g6200f9a
5cryptoportfolio::front_sha256: 69d31251ecd4fcea46d93dfee0184b1171019a765b6744b84f6eec6b10e5818f
6cryptoportfolio::bot_version: v0.4-2-g123411c
7cryptoportfolio::bot_sha256: c344653c6523ed4902e4e4270740c434b45c87876d827d2a695c6732a99cd59b
diff --git a/environments/production/data/types/vps-ovhssd-1.yaml b/environments/production/data/types/vps-ovhssd-1.yaml
index 9130ad1..73f7a45 100644
--- a/environments/production/data/types/vps-ovhssd-1.yaml
+++ b/environments/production/data/types/vps-ovhssd-1.yaml
@@ -3,6 +3,7 @@ classes:
3 base_installation: 3 base_installation:
4 stage: "setup" 4 stage: "setup"
5 5
6base_installation::system_hostname: "%{ldapvar.self.vars.host.0}"
6base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" 7base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net"
7base_installation::grub_device: "/dev/sdb" 8base_installation::grub_device: "/dev/sdb"
8base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" 9base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt"
diff --git a/environments/production/hiera.yaml b/environments/production/hiera.yaml
index 9cedf47..a63fc92 100644
--- a/environments/production/hiera.yaml
+++ b/environments/production/hiera.yaml
@@ -6,15 +6,6 @@ defaults:
6 data_hash: yaml_data 6 data_hash: yaml_data
7 7
8hierarchy: 8hierarchy:
9# FIXME: those informations should be taken in LDAP, but bootstrap
10# problem for the hostname
11 - name: "Per-named-node data"
12 mapped_paths: [ldapvar.self.cn, hostname, "named_nodes/%{hostname}.yaml"]
13
14 - name: "Per-node data"
15 path: "nodes/%{facts.ec2_metadata.hostname}.yaml"
16### /FIXME
17
18 - name: "Initialization variables" 9 - name: "Initialization variables"
19 path: "/root/puppet_variables.json" 10 path: "/root/puppet_variables.json"
20 11