Skip to content

Commit c057c3b

Browse files
committed
Merge remote-tracking branch 'origin/master' into radjabov
2 parents 65f345c + 770b86b commit c057c3b

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
- name: Report code coverage
4646
if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
4747
continue-on-error: true
48-
uses: paambaati/codeclimate-action@v8
48+
uses: paambaati/codeclimate-action@v9

app/models/manageiq/providers/google/network_manager.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ class ManageIQ::Providers::Google::NetworkManager < ManageIQ::Providers::Network
2222
:to => :parent_manager,
2323
:allow_nil => true
2424

25+
class << self
26+
delegate :refresh_ems, :to => ManageIQ::Providers::Google::CloudManager
27+
end
28+
2529
def self.ems_type
2630
@ems_type ||= "gce_network".freeze
2731
end

config/settings.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
:inventory_collections:
1111
:saver_strategy: default
1212
:gce_network:
13+
# Disable scheduled full refresh for the network manager as this will be
14+
# refreshed automatically by the parent cloud manager.
15+
:refresh_interval: 0
1316
:inventory_collections:
1417
:saver_strategy: default
1518
:gke:

0 commit comments

Comments
 (0)