foreman_virt_who_configure 0.4.3 → 0.4.4
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/app/models/foreman_virt_who_configure/config.rb +2 -1
- data/app/models/foreman_virt_who_configure/output_generator.rb +1 -1
- data/app/views/foreman_virt_who_configure/configs/steps/_general_information_form.erb +3 -3
- data/lib/foreman_virt_who_configure/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3a6b680f1c90e8b69f2031c4018997add91244112f8eef99872241929dfefae4
|
|
4
|
+
data.tar.gz: 3b04ac15f9cc9433efb697a779aaeafb4ecc069a1237d28ec0f74d86db34dd92
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c450e7f3f06b9f1a4435266b058790f022bfe6786a81eba37b8ce2dec478e08c1d9790bd25106c543993d0069607ad6f745506c867d6dba60ac4b57eeff5ff25
|
|
7
|
+
data.tar.gz: e720dc2df8586257b5524cc16ef3c594a8e228571164b9096adbe7f9744507909098e271ea658a00286459a3e4f18db06aead4ab9c0c4dabf93e211ddb322903
|
|
@@ -92,12 +92,13 @@ module ForemanVirtWhoConfigure
|
|
|
92
92
|
after_create :create_service_user
|
|
93
93
|
after_destroy :destroy_service_user
|
|
94
94
|
|
|
95
|
-
validates :interval, :hypervisor_type,
|
|
95
|
+
validates :interval, :hypervisor_type,
|
|
96
96
|
:satellite_url, :hypervisor_id, :organization_id, :name,
|
|
97
97
|
:presence => true
|
|
98
98
|
validates :name, :uniqueness => { :scope => :organization_id }
|
|
99
99
|
validates :hypervisor_password, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'libvirt' && c.hypervisor_type != 'kubevirt' }
|
|
100
100
|
validates :hypervisor_username, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'kubevirt' }
|
|
101
|
+
validates :hypervisor_server, :presence => true, :if => Proc.new { |c| c.hypervisor_type != 'kubevirt' }
|
|
101
102
|
validates :hypervisor_type, :inclusion => HYPERVISOR_TYPES.keys
|
|
102
103
|
validates :hypervisor_id, :inclusion => HYPERVISOR_IDS
|
|
103
104
|
validates :interval, :inclusion => AVAILABLE_INTERVALS.keys.map(&:to_i)
|
|
@@ -157,7 +157,7 @@ EOS
|
|
|
157
157
|
end
|
|
158
158
|
|
|
159
159
|
def enabled_filters(filter)
|
|
160
|
-
filter.reject { |_, list| list.
|
|
160
|
+
filter.reject { |_, list| list.blank? }.map { |filter,list| filtering_line_sanitized(filter, list) }.join
|
|
161
161
|
end
|
|
162
162
|
|
|
163
163
|
def filtering_line_sanitized(filter, list)
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
<% end %>
|
|
9
9
|
|
|
10
10
|
<%= select_f f, :hypervisor_type, ForemanVirtWhoConfigure::Config::HYPERVISOR_TYPES, :first, :last %>
|
|
11
|
-
<%= text_f f, :hypervisor_server, inline_help_popover(hypervisor_server_help_data[f.object.hypervisor_type]).merge(:data => { :help => hypervisor_server_help_data }) %>
|
|
12
|
-
<%= text_f f, :hypervisor_username, inline_help_popover(hypervisor_username_help_data[f.object.hypervisor_type]).merge(:data => { :help => hypervisor_username_help_data }) %>
|
|
13
|
-
<%= password_f f, :hypervisor_password, { :value => f.object.hypervisor_password }.merge(inline_help_popover(_('Account password by which virt-who is to connect to the hypervisor instance.'))) %>
|
|
11
|
+
<%= text_f f, :hypervisor_server, { :required => true }.merge(inline_help_popover(hypervisor_server_help_data[f.object.hypervisor_type]).merge(:data => { :help => hypervisor_server_help_data })) %>
|
|
12
|
+
<%= text_f f, :hypervisor_username, { :required => true }.merge(inline_help_popover(hypervisor_username_help_data[f.object.hypervisor_type]).merge(:data => { :help => hypervisor_username_help_data })) %>
|
|
13
|
+
<%= password_f f, :hypervisor_password, { :required => true, :value => f.object.hypervisor_password }.merge(inline_help_popover(_('Account password by which virt-who is to connect to the hypervisor instance.'))) %>
|
|
14
14
|
</div>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: foreman_virt_who_configure
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Foreman virt-who-configure team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-09-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: katello
|