From 8d4db7290ec1dffa9d85c111e75b1ff619a7b985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Sat, 26 Nov 2022 16:44:05 +0100 Subject: [PATCH] Rename dirsrv_primary role The term used in 389 docs is "supplier" instead (ex "master") --- nodes/ldap-3.kosmos.org.json | 4 ++-- roles/{dirsrv_primary.rb => dirsrv_supplier.rb} | 2 +- roles/hubot.rb | 2 +- site-cookbooks/kosmos-dirsrv/recipes/hostsfile.rb | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) rename roles/{dirsrv_primary.rb => dirsrv_supplier.rb} (63%) diff --git a/nodes/ldap-3.kosmos.org.json b/nodes/ldap-3.kosmos.org.json index c3570d0..637595e 100644 --- a/nodes/ldap-3.kosmos.org.json +++ b/nodes/ldap-3.kosmos.org.json @@ -59,6 +59,6 @@ "run_list": [ "recipe[kosmos-base]", "role[kvm_guest]", - "role[dirsrv_primary]" + "role[dirsrv_supplier]" ] -} \ No newline at end of file +} diff --git a/roles/dirsrv_primary.rb b/roles/dirsrv_supplier.rb similarity index 63% rename from roles/dirsrv_primary.rb rename to roles/dirsrv_supplier.rb index ab18c68..bf4cfb3 100644 --- a/roles/dirsrv_primary.rb +++ b/roles/dirsrv_supplier.rb @@ -1,4 +1,4 @@ -name "dirsrv_primary" +name "dirsrv_supplier" run_list %w( recipe[kosmos-dirsrv] diff --git a/roles/hubot.rb b/roles/hubot.rb index 9bdc549..f13d5b0 100644 --- a/roles/hubot.rb +++ b/roles/hubot.rb @@ -7,6 +7,6 @@ default_run_list = %w( env_run_lists( '_default' => default_run_list, - 'development' => [], + 'development' => default_run_list, 'production' => default_run_list ) diff --git a/site-cookbooks/kosmos-dirsrv/recipes/hostsfile.rb b/site-cookbooks/kosmos-dirsrv/recipes/hostsfile.rb index f6e18c5..d3fdc0f 100644 --- a/site-cookbooks/kosmos-dirsrv/recipes/hostsfile.rb +++ b/site-cookbooks/kosmos-dirsrv/recipes/hostsfile.rb @@ -3,12 +3,12 @@ # Recipe:: hostsfile # -dirsrv_primary = search(:node, "role:dirsrv_primary AND chef_environment:#{node.chef_environment}").first +dirsrv_supplier = search(:node, "role:dirsrv_supplier AND chef_environment:#{node.chef_environment}").first -unless dirsrv_primary.nil? - primary_ip = dirsrv_primary['knife_zero']['host'] +unless dirsrv_supplier.nil? + supplier_ip = dirsrv_supplier['knife_zero']['host'] - hostsfile_entry primary_ip do + hostsfile_entry supplier_ip do hostname "ldap.kosmos.local" unique true end