From 1f7b347ef4e1f66336623de42eb6d1875172ea9b Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 17 Feb 2024 22:57:36 +1100 Subject: [PATCH] refacter: tidy facts - create a facts module, move all facts to this module --- environment.conf | 2 +- {site/profiles => modules/facts}/lib/facter/arpa.rb | 0 {site/profiles => modules/facts}/lib/facter/country.rb | 0 {site/profiles => modules/facts}/lib/facter/enc_role_path.rb | 0 {site/profiles => modules/facts}/lib/facter/enc_role_tier1.rb | 0 {site/profiles => modules/facts}/lib/facter/enc_role_tier2.rb | 0 {site/profiles => modules/facts}/lib/facter/enc_role_tier3.rb | 0 {site/profiles => modules/facts}/lib/facter/mariadb_active.rb | 0 {site/profiles => modules/facts}/lib/facter/mariadb_datapath.rb | 0 .../facts}/lib/facter/mariadb_galera_active.rb | 0 .../profiles => modules/facts}/lib/facter/mariadb_installed.rb | 0 .../facts}/lib/facter/minio_datadirs_initialised.rb | 0 .../profiles => modules/facts}/lib/facter/minio_group_exists.rb | 0 {site/profiles => modules/facts}/lib/facter/minio_pool_dns.rb | 0 .../profiles => modules/facts}/lib/facter/minio_user_exists.rb | 0 {site/profiles => modules/facts}/lib/facter/mysql_wsrep.rb | 0 {site/profiles => modules/facts}/lib/facter/region.rb | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename {site/profiles => modules/facts}/lib/facter/arpa.rb (100%) rename {site/profiles => modules/facts}/lib/facter/country.rb (100%) rename {site/profiles => modules/facts}/lib/facter/enc_role_path.rb (100%) rename {site/profiles => modules/facts}/lib/facter/enc_role_tier1.rb (100%) rename {site/profiles => modules/facts}/lib/facter/enc_role_tier2.rb (100%) rename {site/profiles => modules/facts}/lib/facter/enc_role_tier3.rb (100%) rename {site/profiles => modules/facts}/lib/facter/mariadb_active.rb (100%) rename {site/profiles => modules/facts}/lib/facter/mariadb_datapath.rb (100%) rename {site/profiles => modules/facts}/lib/facter/mariadb_galera_active.rb (100%) rename {site/profiles => modules/facts}/lib/facter/mariadb_installed.rb (100%) rename {site/profiles => modules/facts}/lib/facter/minio_datadirs_initialised.rb (100%) rename {site/profiles => modules/facts}/lib/facter/minio_group_exists.rb (100%) rename {site/profiles => modules/facts}/lib/facter/minio_pool_dns.rb (100%) rename {site/profiles => modules/facts}/lib/facter/minio_user_exists.rb (100%) rename {site/profiles => modules/facts}/lib/facter/mysql_wsrep.rb (100%) rename {site/profiles => modules/facts}/lib/facter/region.rb (100%) diff --git a/environment.conf b/environment.conf index 19e7e87..0368a47 100644 --- a/environment.conf +++ b/environment.conf @@ -1,3 +1,3 @@ manifest = manifests/site.pp -modulepath = external_modules:site +modulepath = external_modules:modules:site config_version = '/usr/bin/grep signature /etc/puppetlabs/code/environments/$environment/.g10k-deploy.json | /usr/bin/cut -d \" -f 4' diff --git a/site/profiles/lib/facter/arpa.rb b/modules/facts/lib/facter/arpa.rb similarity index 100% rename from site/profiles/lib/facter/arpa.rb rename to modules/facts/lib/facter/arpa.rb diff --git a/site/profiles/lib/facter/country.rb b/modules/facts/lib/facter/country.rb similarity index 100% rename from site/profiles/lib/facter/country.rb rename to modules/facts/lib/facter/country.rb diff --git a/site/profiles/lib/facter/enc_role_path.rb b/modules/facts/lib/facter/enc_role_path.rb similarity index 100% rename from site/profiles/lib/facter/enc_role_path.rb rename to modules/facts/lib/facter/enc_role_path.rb diff --git a/site/profiles/lib/facter/enc_role_tier1.rb b/modules/facts/lib/facter/enc_role_tier1.rb similarity index 100% rename from site/profiles/lib/facter/enc_role_tier1.rb rename to modules/facts/lib/facter/enc_role_tier1.rb diff --git a/site/profiles/lib/facter/enc_role_tier2.rb b/modules/facts/lib/facter/enc_role_tier2.rb similarity index 100% rename from site/profiles/lib/facter/enc_role_tier2.rb rename to modules/facts/lib/facter/enc_role_tier2.rb diff --git a/site/profiles/lib/facter/enc_role_tier3.rb b/modules/facts/lib/facter/enc_role_tier3.rb similarity index 100% rename from site/profiles/lib/facter/enc_role_tier3.rb rename to modules/facts/lib/facter/enc_role_tier3.rb diff --git a/site/profiles/lib/facter/mariadb_active.rb b/modules/facts/lib/facter/mariadb_active.rb similarity index 100% rename from site/profiles/lib/facter/mariadb_active.rb rename to modules/facts/lib/facter/mariadb_active.rb diff --git a/site/profiles/lib/facter/mariadb_datapath.rb b/modules/facts/lib/facter/mariadb_datapath.rb similarity index 100% rename from site/profiles/lib/facter/mariadb_datapath.rb rename to modules/facts/lib/facter/mariadb_datapath.rb diff --git a/site/profiles/lib/facter/mariadb_galera_active.rb b/modules/facts/lib/facter/mariadb_galera_active.rb similarity index 100% rename from site/profiles/lib/facter/mariadb_galera_active.rb rename to modules/facts/lib/facter/mariadb_galera_active.rb diff --git a/site/profiles/lib/facter/mariadb_installed.rb b/modules/facts/lib/facter/mariadb_installed.rb similarity index 100% rename from site/profiles/lib/facter/mariadb_installed.rb rename to modules/facts/lib/facter/mariadb_installed.rb diff --git a/site/profiles/lib/facter/minio_datadirs_initialised.rb b/modules/facts/lib/facter/minio_datadirs_initialised.rb similarity index 100% rename from site/profiles/lib/facter/minio_datadirs_initialised.rb rename to modules/facts/lib/facter/minio_datadirs_initialised.rb diff --git a/site/profiles/lib/facter/minio_group_exists.rb b/modules/facts/lib/facter/minio_group_exists.rb similarity index 100% rename from site/profiles/lib/facter/minio_group_exists.rb rename to modules/facts/lib/facter/minio_group_exists.rb diff --git a/site/profiles/lib/facter/minio_pool_dns.rb b/modules/facts/lib/facter/minio_pool_dns.rb similarity index 100% rename from site/profiles/lib/facter/minio_pool_dns.rb rename to modules/facts/lib/facter/minio_pool_dns.rb diff --git a/site/profiles/lib/facter/minio_user_exists.rb b/modules/facts/lib/facter/minio_user_exists.rb similarity index 100% rename from site/profiles/lib/facter/minio_user_exists.rb rename to modules/facts/lib/facter/minio_user_exists.rb diff --git a/site/profiles/lib/facter/mysql_wsrep.rb b/modules/facts/lib/facter/mysql_wsrep.rb similarity index 100% rename from site/profiles/lib/facter/mysql_wsrep.rb rename to modules/facts/lib/facter/mysql_wsrep.rb diff --git a/site/profiles/lib/facter/region.rb b/modules/facts/lib/facter/region.rb similarity index 100% rename from site/profiles/lib/facter/region.rb rename to modules/facts/lib/facter/region.rb