From 47e891189100fd463ba40b4658f6e78393839b71 Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 13:24:47 -0400 Subject: [PATCH 1/3] Update ha_config.pp use of hard-coded passwords should be avoided ... suggesting use of hiera --- contrail/environment/modules/contrail/manifests/ha_config.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrail/environment/modules/contrail/manifests/ha_config.pp b/contrail/environment/modules/contrail/manifests/ha_config.pp index 83508160..b290e663 100644 --- a/contrail/environment/modules/contrail/manifests/ha_config.pp +++ b/contrail/environment/modules/contrail/manifests/ha_config.pp @@ -117,9 +117,9 @@ } $cmon_db_user = "cmon" - $cmon_db_pass = "cmon" + $cmon_db_pass = hiera('cmon_db_pwd') $keystone_db_user = "keystone" - $keystone_db_pass = "keystone" + $keystone_db_pass = hiera('keystone_db_pwd') # Hard-coded to true because this code runs only when internal vip is defined $monitor_galera="True" From 8d0ab2831971bb756a546fec97a3e6d7ab853b27 Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 13:25:38 -0400 Subject: [PATCH 2/3] Create common.yaml --- contrail/environment/modules/contrail/hieradata/common.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 contrail/environment/modules/contrail/hieradata/common.yaml diff --git a/contrail/environment/modules/contrail/hieradata/common.yaml b/contrail/environment/modules/contrail/hieradata/common.yaml new file mode 100644 index 00000000..86a6e83b --- /dev/null +++ b/contrail/environment/modules/contrail/hieradata/common.yaml @@ -0,0 +1,3 @@ +--- +cmon_db_pwd: cmon +keystone_db_pwd: keystone From 5f7b99b072b1cc32336fb565f0621838c16efd91 Mon Sep 17 00:00:00 2001 From: Akond Rahman Date: Sat, 14 Jul 2018 13:26:34 -0400 Subject: [PATCH 3/3] Create hiera.yaml hard-coded passwords should be avoided ... suggesting use of hiera --- contrail/environment/modules/contrail/hiera.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 contrail/environment/modules/contrail/hiera.yaml diff --git a/contrail/environment/modules/contrail/hiera.yaml b/contrail/environment/modules/contrail/hiera.yaml new file mode 100644 index 00000000..48cd7ff9 --- /dev/null +++ b/contrail/environment/modules/contrail/hiera.yaml @@ -0,0 +1,6 @@ +:hierarchy: + - common +:backends: + - yaml +:yaml: +:datadir: 'hieradata'