From c5909043133e8d32e98785db9c652a9dd655c126 Mon Sep 17 00:00:00 2001 From: "christopher.lawrence" Date: Wed, 4 Mar 2020 15:10:54 +0000 Subject: [PATCH] fixed issues with modules and autosign errors --- data/nodes/peadm-01.pe.yaml | 3 +++ data/secrets/node/peadm-01.pe.yaml | 2 ++ data/secrets/node/puppet.home.eyaml | 2 +- site-modules/profile/manifests/base/motd.pp | 1 + site-modules/profile/manifests/puppetserver/authority.pp | 8 ++++---- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 data/nodes/peadm-01.pe.yaml create mode 100644 data/secrets/node/peadm-01.pe.yaml diff --git a/data/nodes/peadm-01.pe.yaml b/data/nodes/peadm-01.pe.yaml new file mode 100644 index 0000000..dabcf48 --- /dev/null +++ b/data/nodes/peadm-01.pe.yaml @@ -0,0 +1,3 @@ +--- +profile::puppetserver::authority: true +profile::puppetserver::authority::validity: 7200 diff --git a/data/secrets/node/peadm-01.pe.yaml b/data/secrets/node/peadm-01.pe.yaml new file mode 100644 index 0000000..2e055b3 --- /dev/null +++ b/data/secrets/node/peadm-01.pe.yaml @@ -0,0 +1,2 @@ +--- +profile::puppetserver::authority::jwt_secret: "ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnLKlgSOslWvpo+tVP2Fd/ITPkWLc7GM2cXd3bI8tB2PqsnEDOfWYFh8Pp58nzOZTPomTVxtQ0ptud6A+VhGbQ55P5ha9GzW9Pra5q0pQEsoGjJQhLKVsbLlivYN5j+W0pfR3hAr6NgKVBX0qwESOAKKIrYth34qH7Fsrk19VDKLOUJPSbVCajwwbUdj3s0j+8k3CCkey8+FmzTDeqjNGDDMmSxcWAySfX0LfZI3GGgJDfHgo3HDia3MiN0PLfNIOpeIFWRgWnzNrzHbt3RnEV7HIp1R+W2lyr/OWCGgBPco6t7oddqk9n3i35/0pxTsKmZEjasZyNvf51/PNwKK2VjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAaFxUesvj7c9N47ru3WWyugCDAjwhS8BqA1n37yWGIGNCrdfQDUDr/dBMZTbmaoLAKLg==]" diff --git a/data/secrets/node/puppet.home.eyaml b/data/secrets/node/puppet.home.eyaml index 3c21a95..2e055b3 100644 --- a/data/secrets/node/puppet.home.eyaml +++ b/data/secrets/node/puppet.home.eyaml @@ -1,2 +1,2 @@ --- -profile::puppetserver::authority::jwt_secret: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnLKlgSOslWvpo+tVP2Fd/ITPkWLc7GM2cXd3bI8tB2PqsnEDOfWYFh8Pp58nzOZTPomTVxtQ0ptud6A+VhGbQ55P5ha9GzW9Pra5q0pQEsoGjJQhLKVsbLlivYN5j+W0pfR3hAr6NgKVBX0qwESOAKKIrYth34qH7Fsrk19VDKLOUJPSbVCajwwbUdj3s0j+8k3CCkey8+FmzTDeqjNGDDMmSxcWAySfX0LfZI3GGgJDfHgo3HDia3MiN0PLfNIOpeIFWRgWnzNrzHbt3RnEV7HIp1R+W2lyr/OWCGgBPco6t7oddqk9n3i35/0pxTsKmZEjasZyNvf51/PNwKK2VjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAaFxUesvj7c9N47ru3WWyugCDAjwhS8BqA1n37yWGIGNCrdfQDUDr/dBMZTbmaoLAKLg==] +profile::puppetserver::authority::jwt_secret: "ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAnLKlgSOslWvpo+tVP2Fd/ITPkWLc7GM2cXd3bI8tB2PqsnEDOfWYFh8Pp58nzOZTPomTVxtQ0ptud6A+VhGbQ55P5ha9GzW9Pra5q0pQEsoGjJQhLKVsbLlivYN5j+W0pfR3hAr6NgKVBX0qwESOAKKIrYth34qH7Fsrk19VDKLOUJPSbVCajwwbUdj3s0j+8k3CCkey8+FmzTDeqjNGDDMmSxcWAySfX0LfZI3GGgJDfHgo3HDia3MiN0PLfNIOpeIFWRgWnzNrzHbt3RnEV7HIp1R+W2lyr/OWCGgBPco6t7oddqk9n3i35/0pxTsKmZEjasZyNvf51/PNwKK2VjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAaFxUesvj7c9N47ru3WWyugCDAjwhS8BqA1n37yWGIGNCrdfQDUDr/dBMZTbmaoLAKLg==]" diff --git a/site-modules/profile/manifests/base/motd.pp b/site-modules/profile/manifests/base/motd.pp index ea1fd3f..c7a831a 100644 --- a/site-modules/profile/manifests/base/motd.pp +++ b/site-modules/profile/manifests/base/motd.pp @@ -1,4 +1,5 @@ class profile::base::motd ( ) { class { '::motd': + } } diff --git a/site-modules/profile/manifests/puppetserver/authority.pp b/site-modules/profile/manifests/puppetserver/authority.pp index 5e5102e..a3b8d44 100644 --- a/site-modules/profile/manifests/puppetserver/authority.pp +++ b/site-modules/profile/manifests/puppetserver/authority.pp @@ -1,8 +1,8 @@ class profile::puppetserver::authority ( - String "$jwt_secret" = 'undef', + String $jwt_secret = 'undef', String $loglevel = 'info', - Integer "$validity" = '0', + Integer $validity = '0', String $ensure = 'latest', Hash $config = {}, Hash $jwt_token = {}, @@ -22,8 +22,8 @@ class profile::puppetserver::authority ( loglevel => $loglevel, }, jwt_token => { - secret => "$jwt_secret", - validity => "$validity", + secret => \"$jwt_secret\", + validity => $validity, } }, }