Merge remote-tracking branch 'origin/master' into radjabov

ManageIQ · Nov 4, 2024 · 2a73d2f · 2a73d2f
2 parents 87c44f0 + cc9c42b
commit 2a73d2f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,4 +45,4 @@ jobs:
     - name: Report code coverage
       if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
       continue-on-error: true
-      uses: paambaati/codeclimate-action@v8
+      uses: paambaati/codeclimate-action@v9
diff --git a/app/models/manageiq/providers/azure/network_manager.rb b/app/models/manageiq/providers/azure/network_manager.rb
@@ -25,6 +25,10 @@ class ManageIQ::Providers::Azure::NetworkManager < ManageIQ::Providers::NetworkM
            :to        => :parent_manager,
            :allow_nil => true
 
+  class << self
+    delegate :refresh_ems, :to => ManageIQ::Providers::Azure::CloudManager
+  end
+
   def self.ems_type
     @ems_type ||= "azure_network".freeze
   end

diff --git a/config/settings.yml b/config/settings.yml
@@ -72,6 +72,9 @@
       # Strategy for saving, another allowed is batch, doing batch SQL queries [Graph refresh only]
       :saver_strategy: default
   :azure_network:
+    # Disable scheduled full refresh for the network manager as this will be
+    # refreshed automatically by the parent cloud manager.
+    :refresh_interval: 0
     :inventory_collections:
       :saver_strategy: default
 :http_proxy: