Use `primary?` and `secondary?` instead of the *_role_enabled?

config/initializers/geo.rb

@@ -5,8 +5,7 @@ if File.exist?(Rails.root.join('config/database_geo.yml'))
 end
 
 begin
-  # Avoid using the database if this is run in a Rake task
-  if Gitlab::Geo.primary_role_enabled?
+  if Gitlab::Geo.primary?
     Gitlab::Geo.current_node&.update_clone_url!
   end
 rescue => e

lib/gitlab/geo.rb

@@ -113,9 +113,9 @@ module Gitlab
     end
 
     def self.configure_cron_jobs!
-      if self.primary_role_enabled?
+      if self.primary?
         self.configure_primary_jobs!
-      elsif self.secondary_role_enabled?
+      elsif self.secondary?
         self.configure_secondary_jobs!
       else
         self.enable_all_cron_jobs!

spec/lib/gitlab/geo_spec.rb

@@ -142,8 +142,8 @@ describe Gitlab::Geo, lib: true do
     end
 
     it 'activates cron jobs for primary' do
-      allow(described_class).to receive(:primary_role_enabled?).and_return(true)
-      allow(described_class).to receive(:secondary_role_enabled?).and_return(false)
+      allow(described_class).to receive(:primary?).and_return(true)
+      allow(described_class).to receive(:secondary?).and_return(false)
 
       described_class.configure_cron_jobs!
 
@@ -154,8 +154,8 @@ describe Gitlab::Geo, lib: true do
     end
 
     it 'activates cron jobs for secondary' do
-      allow(described_class).to receive(:primary_role_enabled?).and_return(false)
-      allow(described_class).to receive(:secondary_role_enabled?).and_return(true)
+      allow(described_class).to receive(:primary?).and_return(false)
+      allow(described_class).to receive(:secondary?).and_return(true)
 
       described_class.configure_cron_jobs!
 
@@ -166,8 +166,8 @@ describe Gitlab::Geo, lib: true do
     end
 
     it 'deactivates all jobs when Geo is not active' do
-      allow(described_class).to receive(:primary_role_enabled?).and_return(false)
-      allow(described_class).to receive(:secondary_role_enabled?).and_return(false)
+      allow(described_class).to receive(:primary?).and_return(false)
+      allow(described_class).to receive(:secondary?).and_return(false)
 
       described_class.configure_cron_jobs!
 
@@ -178,14 +178,14 @@ describe Gitlab::Geo, lib: true do
     end
 
     it 'reactivates cron jobs when node turns off Geo' do
-      allow(described_class).to receive(:primary_role_enabled?).and_return(false)
-      allow(described_class).to receive(:secondary_role_enabled?).and_return(true)
+      allow(described_class).to receive(:primary?).and_return(false)
+      allow(described_class).to receive(:secondary?).and_return(true)
 
       described_class.configure_cron_jobs!
       expect(Sidekiq::Cron::Job.find('ldap_test')).not_to be_enabled
 
-      allow(described_class).to receive(:primary_role_enabled?).and_return(false)
-      allow(described_class).to receive(:secondary_role_enabled?).and_return(false)
+      allow(described_class).to receive(:primary?).and_return(false)
+      allow(described_class).to receive(:secondary?).and_return(false)
 
       described_class.configure_cron_jobs!
       expect(Sidekiq::Cron::Job.find('ldap_test')).to be_enabled