From 1b952f02a566a272fd891b24fbf822ce0b31f8cd Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 00:36:35 -0400 Subject: [PATCH 1/4] Update conductor.pp replacing hard-coded password with hiera --- recipes/aeolus/manifests/conductor.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp index 8e407e3..826457d 100644 --- a/recipes/aeolus/manifests/conductor.pp +++ b/recipes/aeolus/manifests/conductor.pp @@ -109,7 +109,7 @@ notify => Service["postgresql"] } postgres::user{"aeolus": - password => "v23zj59an", + password => hiera('aeolus_password'), roles => "CREATEDB", require => Service["postgresql"] } From 7666a1ce54b31def4f834ab3fa4441add92fdfcd Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 00:38:58 -0400 Subject: [PATCH 2/4] Create hiera.yaml replacing hard coded password with hiera --- recipes/aeolus/hiera.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 recipes/aeolus/hiera.yaml diff --git a/recipes/aeolus/hiera.yaml b/recipes/aeolus/hiera.yaml new file mode 100644 index 0000000..48cd7ff --- /dev/null +++ b/recipes/aeolus/hiera.yaml @@ -0,0 +1,6 @@ +:hierarchy: + - common +:backends: + - yaml +:yaml: +:datadir: 'hieradata' From bdf4d8c6f2dffecafe1929ca8a71abde4b65773a Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 00:45:11 -0400 Subject: [PATCH 3/4] Update conductor.pp to add hieara support ... replacing hard-coded password --- recipes/aeolus/manifests/conductor.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp index 826457d..a3169ce 100644 --- a/recipes/aeolus/manifests/conductor.pp +++ b/recipes/aeolus/manifests/conductor.pp @@ -145,7 +145,7 @@ aeolus::conductor::destroy_temp_admins{ "before" : } aeolus::conductor::site_admin{"admin": email => 'root@localhost.localdomain', - password => "password", + password => hiera('aeolus_site_admin_password'), first_name => 'Administrator', last_name => '', require => Aeolus::Conductor::Destroy_temp_admins["before"]} From ca587ae07aaba1b9a9d2fb6e64f3b5e16c93ddfe Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 00:45:32 -0400 Subject: [PATCH 4/4] common.yaml to support hiera --- recipes/aeolus/hieradata/common.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 recipes/aeolus/hieradata/common.yaml diff --git a/recipes/aeolus/hieradata/common.yaml b/recipes/aeolus/hieradata/common.yaml new file mode 100644 index 0000000..71dea81 --- /dev/null +++ b/recipes/aeolus/hieradata/common.yaml @@ -0,0 +1,3 @@ +--- +aeolus_password: v23zj59an +aeolus_site_admin_password: password