foreman_maintain 1.13.5 → 1.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/definitions/checks/foreman/check_corrupted_roles.rb +1 -3
- data/definitions/features/iop.rb +4 -2
- data/definitions/procedures/foreman/fix_corrupted_roles.rb +6 -7
- data/definitions/reports/iop_remediations.rb +1 -1
- data/definitions/scenarios/foreman_upgrade.rb +0 -1
- data/definitions/scenarios/satellite_upgrade.rb +0 -1
- data/lib/foreman_maintain/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 580f9ed6daf35b7d33e6882ed898e6f9e157cf2c1624d41d00b59307f946100f
|
|
4
|
+
data.tar.gz: ee891a1e0626efd104d723c5e1238aba4646e98b2ba3f2f4c1f6ad18fa6b5360
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1061e9ed5bf86aeb1e06f7443be45ba4537f09f7c098becfca7d525494b7bd8dcbe48fb0b3d8a1fd93e2bd902d46d721101006090f02cafd9c6bd6b25cf0631a
|
|
7
|
+
data.tar.gz: a4901ffda5a1ed71dabf18efd1910a4505713b946400bec86f76a9cd5e4338357afec55b41f758fd2a7ccc2f3c94c55e0b0cdde4fc639fa3a6dd5a9633f933f0
|
|
@@ -32,7 +32,6 @@ module Checks
|
|
|
32
32
|
filters.role_id,
|
|
33
33
|
filters.search,
|
|
34
34
|
filters.taxonomy_search,
|
|
35
|
-
filters.override,
|
|
36
35
|
filterings.id AS filtering_id,
|
|
37
36
|
permissions.id AS permission_id,
|
|
38
37
|
permissions.name AS permission_name,
|
|
@@ -52,8 +51,7 @@ module Checks
|
|
|
52
51
|
first.permission_name,
|
|
53
52
|
first.resource_type,
|
|
54
53
|
first.search,
|
|
55
|
-
first.taxonomy_search
|
|
56
|
-
first.override
|
|
54
|
+
first.taxonomy_search
|
|
57
55
|
FROM (#{subquery}) first JOIN (#{subquery}) second
|
|
58
56
|
ON first.filter_id = second.filter_id AND
|
|
59
57
|
((first.resource_type IS NOT NULL AND second.resource_type IS NULL)
|
data/definitions/features/iop.rb
CHANGED
|
@@ -3,7 +3,8 @@ class Features::Iop < ForemanMaintain::Feature
|
|
|
3
3
|
label :iop
|
|
4
4
|
|
|
5
5
|
confine do
|
|
6
|
-
feature(:installer)&.answers&.
|
|
6
|
+
feature(:installer)&.answers&.fetch('iop', nil).is_a?(Hash) and
|
|
7
|
+
feature(:installer)&.answers&.dig('iop', 'ensure') == 'present'
|
|
7
8
|
end
|
|
8
9
|
end
|
|
9
10
|
|
|
@@ -12,6 +13,7 @@ class Features::Iop < ForemanMaintain::Feature
|
|
|
12
13
|
'insights-engine',
|
|
13
14
|
'gateway',
|
|
14
15
|
'host-inventory',
|
|
16
|
+
'host-inventory-frontend',
|
|
15
17
|
'ingress',
|
|
16
18
|
'puptoo',
|
|
17
19
|
'yuptoo',
|
|
@@ -26,7 +28,7 @@ class Features::Iop < ForemanMaintain::Feature
|
|
|
26
28
|
def config_files
|
|
27
29
|
[
|
|
28
30
|
'/var/lib/containers/storage/volumes/iop-core-kafka-data',
|
|
29
|
-
'/var/lib/vmaas',
|
|
31
|
+
'/var/lib/containers/storage/volumes/iop-service-vmaas-data',
|
|
30
32
|
]
|
|
31
33
|
end
|
|
32
34
|
|
|
@@ -34,8 +34,7 @@ module Procedures::Foreman
|
|
|
34
34
|
def update_records(set)
|
|
35
35
|
new_filter = create_filter set.first['role_id'],
|
|
36
36
|
set.first['search'],
|
|
37
|
-
set.first['taxonomy_search']
|
|
38
|
-
set.first['override']
|
|
37
|
+
set.first['taxonomy_search']
|
|
39
38
|
set.each do |item|
|
|
40
39
|
destroy_filtering item
|
|
41
40
|
next if !new_filter || new_filter.empty?
|
|
@@ -43,9 +42,9 @@ module Procedures::Foreman
|
|
|
43
42
|
end
|
|
44
43
|
end
|
|
45
44
|
|
|
46
|
-
def create_filter(role_id, search, taxonomy_search
|
|
45
|
+
def create_filter(role_id, search, taxonomy_search)
|
|
47
46
|
feature(:foreman_database).query(
|
|
48
|
-
create_filter_query(search, role_id, taxonomy_search
|
|
47
|
+
create_filter_query(search, role_id, taxonomy_search)
|
|
49
48
|
).first
|
|
50
49
|
end
|
|
51
50
|
|
|
@@ -53,11 +52,11 @@ module Procedures::Foreman
|
|
|
53
52
|
value ? "'#{value}'" : 'NULL'
|
|
54
53
|
end
|
|
55
54
|
|
|
56
|
-
def create_filter_query(search, role_id, taxonomy_search
|
|
55
|
+
def create_filter_query(search, role_id, taxonomy_search)
|
|
57
56
|
<<-SQL
|
|
58
57
|
WITH rows AS (
|
|
59
|
-
INSERT INTO filters (search, role_id, taxonomy_search,
|
|
60
|
-
VALUES (#{escape_val(search)}, #{role_id}, #{escape_val(taxonomy_search)}, '#{
|
|
58
|
+
INSERT INTO filters (search, role_id, taxonomy_search, created_at, updated_at)
|
|
59
|
+
VALUES (#{escape_val(search)}, #{role_id}, #{escape_val(taxonomy_search)}, '#{Time.now}', '#{Time.now}')
|
|
61
60
|
RETURNING id
|
|
62
61
|
)
|
|
63
62
|
SELECT id
|