From 85abd2fdbad83430df4824843764719064afb9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 3 Mar 2018 22:24:19 +0100 Subject: Fetch node informations from LDAP environment, hostname --- environments/production/data/nodes/vps464408.novalocal.yaml | 1 - environments/production/data/nodes/vps494082.yaml | 5 ----- environments/production/data/roles/cryptoportfolio.yaml | 4 ++++ environments/production/data/types/vps-ovhssd-1.yaml | 1 + environments/production/hiera.yaml | 9 --------- 5 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 environments/production/data/nodes/vps464408.novalocal.yaml delete mode 100644 environments/production/data/nodes/vps494082.yaml (limited to 'environments/production') 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 @@ -base_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 @@ -base_installation::system_hostname: cryptoportfolio.immae.eu -cryptoportfolio::front_version: v0.0.2 -cryptoportfolio::front_sha256: 2ace0197a34f9f130523eecf8a43aa4f411cdca09de33838e074f25a7e1d6c5e -cryptoportfolio::bot_version: v0.2-4-gf70bb85 -cryptoportfolio::bot_sha256: e9850a667e0672cdd0363bb93124b59610c4d67e3ed9908b004a9d15c2276340 diff --git a/environments/production/data/roles/cryptoportfolio.yaml b/environments/production/data/roles/cryptoportfolio.yaml index da46382..7464b3d 100644 --- a/environments/production/data/roles/cryptoportfolio.yaml +++ b/environments/production/data/roles/cryptoportfolio.yaml @@ -1,3 +1,7 @@ --- classes: role::cryptoportfolio: ~ +cryptoportfolio::front_version: v0.0.2 +cryptoportfolio::front_sha256: 2ace0197a34f9f130523eecf8a43aa4f411cdca09de33838e074f25a7e1d6c5e +cryptoportfolio::bot_version: v0.2-4-gf70bb85 +cryptoportfolio::bot_sha256: e9850a667e0672cdd0363bb93124b59610c4d67e3ed9908b004a9d15c2276340 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: base_installation: stage: "setup" +base_installation::system_hostname: "%{ldapvar.self.vars.host.0}" base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" base_installation::grub_device: "/dev/sdb" base_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: data_hash: yaml_data hierarchy: -# FIXME: those informations should be taken in LDAP, but bootstrap -# problem for the hostname - - name: "Per-named-node data" - mapped_paths: [ldapvar.self.cn, hostname, "named_nodes/%{hostname}.yaml"] - - - name: "Per-node data" - path: "nodes/%{facts.ec2_metadata.hostname}.yaml" -### /FIXME - - name: "Initialization variables" path: "/root/puppet_variables.json" -- cgit v1.2.3