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/integration/data/common.yaml | 25 ++++++++++++++++++++++ .../integration/data/roles/cryptoportfolio.yaml | 7 ++++++ .../integration/data/types/vps-ovhssd-1.yaml | 10 +++++++++ environments/integration/hiera.yaml | 19 ++++++++++++++++ .../production/data/nodes/vps464408.novalocal.yaml | 1 - environments/production/data/nodes/vps494082.yaml | 5 ----- .../production/data/roles/cryptoportfolio.yaml | 4 ++++ .../production/data/types/vps-ovhssd-1.yaml | 1 + environments/production/hiera.yaml | 9 -------- 9 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 environments/integration/data/common.yaml create mode 100644 environments/integration/data/roles/cryptoportfolio.yaml create mode 100644 environments/integration/data/types/vps-ovhssd-1.yaml create mode 100644 environments/integration/hiera.yaml delete mode 100644 environments/production/data/nodes/vps464408.novalocal.yaml delete mode 100644 environments/production/data/nodes/vps494082.yaml (limited to 'environments') diff --git a/environments/integration/data/common.yaml b/environments/integration/data/common.yaml new file mode 100644 index 0000000..78cce6b --- /dev/null +++ b/environments/integration/data/common.yaml @@ -0,0 +1,25 @@ +--- +classes: + stdlib: ~ + +base_installation::ldap_base: "dc=immae,dc=eu" +base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae,dc=eu" +base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" +base_installation::ldap_server: "ldap.immae.eu" +base_installation::ldap_uri: "ldaps://ldap.immae.eu" +base_installation::puppet_conf_path: "/etc/puppetlabs/puppet" +base_installation::puppet_code_path: "/etc/puppetlabs/code" +base_installation::puppet_pass_seed: "/etc/puppetlabs/puppet/password_seed" +base_installation::puppet_ssl_path: "/etc/puppetlabs/ssl" +base_installation::system_locales: ["fr_FR.UTF-8", "en_US.UTF-8"] +base_installation::system_timezone: "Europe/Paris" +base_installation::system_users: + - userid: 1000 + username: "immae" + groups: ["wheel"] + keys: + - host: "immae.eu" + key: "AAAAB3NzaC1yc2EAAAADAQABAAABAQDi5PgLBwMRyRwzJPnSgUyRAuB9AAxMijsw1pR/t/wmxQne1O5fIPOleHx+D8dyZbwm+XkzlcJpgT0Qy3qC9J8BPhshJvO/tA/8CI/oS/FE0uWsyACH1DMO2dk4gRRZGSE9IuzDMRPlnfZ3n0tdsPzzv3GH4It/oPIgsvkTowKztGLQ7Xmjr5BxzAhXcIQymqA0U3XWHSdWvnSRDaOFG0PDoVMS85IdwlviVKLnV5Sstb4NC/P28LFfgvW8DO/XrOqujgDomqTmR41dK/AyrGGOb2cQUMO4l8Oa+74aOyKaB61rr/rJkr+wCbEttkTvgFa6zZygSk3edfiWE2rgn4+v" + key_type: "ssh-rsa" +xmr_stak::mining_pool: "pool.minexmr.com:7777" +xmr_stak::wallet: "44CA8TxTFYbQqN2kLyk8AnB6Ghz4mcbGpYC2EyXW7A8H9QspvWnTjDn39XUZDPrFwPa5JNwt4TmAxcooPWv4SaJqL87Bcdo" diff --git a/environments/integration/data/roles/cryptoportfolio.yaml b/environments/integration/data/roles/cryptoportfolio.yaml new file mode 100644 index 0000000..7464b3d --- /dev/null +++ b/environments/integration/data/roles/cryptoportfolio.yaml @@ -0,0 +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/integration/data/types/vps-ovhssd-1.yaml b/environments/integration/data/types/vps-ovhssd-1.yaml new file mode 100644 index 0000000..73f7a45 --- /dev/null +++ b/environments/integration/data/types/vps-ovhssd-1.yaml @@ -0,0 +1,10 @@ +--- +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" +ssl::try_letsencrypt_for_real_hostname: false diff --git a/environments/integration/hiera.yaml b/environments/integration/hiera.yaml new file mode 100644 index 0000000..a63fc92 --- /dev/null +++ b/environments/integration/hiera.yaml @@ -0,0 +1,19 @@ +--- +version: 5 + +defaults: + datadir: data + data_hash: yaml_data + +hierarchy: + - name: "Initialization variables" + path: "/root/puppet_variables.json" + + - name: "Per-role data" + mapped_paths: [ldapvar.self.vars.roles, role, "roles/%{role}.yaml"] + + - name: "Per-type data" + path: "types/%{facts.ec2_metadata.instance-type}.yaml" + + - name: "Common data" + path: "common.yaml" 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