foreman_bootdisk 21.2.3 → 22.0.1
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/assets/javascripts/foreman_bootdisk/locale/ca/foreman_bootdisk.js +108 -120
- data/app/assets/javascripts/foreman_bootdisk/locale/cs_CZ/foreman_bootdisk.js +105 -117
- data/app/assets/javascripts/foreman_bootdisk/locale/de/foreman_bootdisk.js +158 -170
- data/app/assets/javascripts/foreman_bootdisk/locale/en/foreman_bootdisk.js +85 -97
- data/app/assets/javascripts/foreman_bootdisk/locale/en_GB/foreman_bootdisk.js +157 -169
- data/app/assets/javascripts/foreman_bootdisk/locale/es/foreman_bootdisk.js +158 -170
- data/app/assets/javascripts/foreman_bootdisk/locale/fr/foreman_bootdisk.js +158 -170
- data/app/assets/javascripts/foreman_bootdisk/locale/it/foreman_bootdisk.js +118 -130
- data/app/assets/javascripts/foreman_bootdisk/locale/ja/foreman_bootdisk.js +157 -169
- data/app/assets/javascripts/foreman_bootdisk/locale/ka/foreman_bootdisk.js +157 -169
- data/app/assets/javascripts/foreman_bootdisk/locale/ko/foreman_bootdisk.js +158 -170
- data/app/assets/javascripts/foreman_bootdisk/locale/pt_BR/foreman_bootdisk.js +157 -169
- data/app/assets/javascripts/foreman_bootdisk/locale/ru/foreman_bootdisk.js +131 -143
- data/app/assets/javascripts/foreman_bootdisk/locale/sv_SE/foreman_bootdisk.js +103 -115
- data/app/assets/javascripts/foreman_bootdisk/locale/zh_CN/foreman_bootdisk.js +156 -168
- data/app/assets/javascripts/foreman_bootdisk/locale/zh_TW/foreman_bootdisk.js +129 -141
- data/app/lib/foreman_bootdisk/scope/bootdisk.rb +0 -42
- data/app/lib/foreman_bootdisk/template_helpers.rb +48 -0
- data/app/services/foreman_bootdisk/iso_generator.rb +1 -1
- data/config/initializers/inflections.rb +5 -0
- data/db/migrate/20131021095100_edit_host_bootdisk_template_dns_secondary.rb +1 -1
- data/lib/foreman_bootdisk/engine.rb +102 -107
- data/lib/foreman_bootdisk/engine.rb.orig +106 -109
- data/lib/foreman_bootdisk/version.rb +1 -1
- data/locale/Makefile +12 -2
- data/locale/ca/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/ca/foreman_bootdisk.edit.po +1 -1
- data/locale/ca/foreman_bootdisk.po +1 -13
- data/locale/cs_CZ/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/cs_CZ/foreman_bootdisk.edit.po +32 -34
- data/locale/cs_CZ/foreman_bootdisk.po +30 -40
- data/locale/de/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/de/foreman_bootdisk.edit.po +3 -3
- data/locale/de/foreman_bootdisk.po +3 -15
- data/locale/en/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/en/foreman_bootdisk.edit.po +1 -1
- data/locale/en/foreman_bootdisk.po +9 -19
- data/locale/en_GB/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/en_GB/foreman_bootdisk.edit.po +1 -1
- data/locale/en_GB/foreman_bootdisk.po +1 -13
- data/locale/es/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/es/foreman_bootdisk.edit.po +1 -1
- data/locale/es/foreman_bootdisk.po +6 -16
- data/locale/fr/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/fr/foreman_bootdisk.edit.po +3 -3
- data/locale/fr/foreman_bootdisk.po +6 -16
- data/locale/it/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/it/foreman_bootdisk.edit.po +1 -1
- data/locale/it/foreman_bootdisk.po +1 -13
- data/locale/ja/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/ja/foreman_bootdisk.edit.po +14 -15
- data/locale/ja/foreman_bootdisk.po +7 -18
- data/locale/ka/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/ka/foreman_bootdisk.edit.po +1 -1
- data/locale/ka/foreman_bootdisk.po +1 -13
- data/locale/ko/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/ko/foreman_bootdisk.edit.po +1 -1
- data/locale/ko/foreman_bootdisk.po +47 -59
- data/locale/pt_BR/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/pt_BR/foreman_bootdisk.edit.po +1 -1
- data/locale/pt_BR/foreman_bootdisk.po +1 -13
- data/locale/ru/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/ru/foreman_bootdisk.edit.po +1 -1
- data/locale/ru/foreman_bootdisk.po +1 -13
- data/locale/sv_SE/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/sv_SE/foreman_bootdisk.edit.po +1 -1
- data/locale/sv_SE/foreman_bootdisk.po +1 -13
- data/locale/zh_CN/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/zh_CN/foreman_bootdisk.edit.po +2 -2
- data/locale/zh_CN/foreman_bootdisk.po +2 -14
- data/locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo +0 -0
- data/locale/zh_TW/foreman_bootdisk.edit.po +1 -1
- data/locale/zh_TW/foreman_bootdisk.po +1 -13
- metadata +5 -4
- data/locale/action_names.rb +0 -5
|
@@ -9,11 +9,6 @@ module ForemanBootdisk
|
|
|
9
9
|
engine_name 'foreman_bootdisk'
|
|
10
10
|
isolate_namespace ForemanBootdisk
|
|
11
11
|
|
|
12
|
-
config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
|
|
13
|
-
config.autoload_paths += Dir["#{config.root}/app/helpers"]
|
|
14
|
-
config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
|
|
15
|
-
config.autoload_paths += Dir["#{config.root}/app/lib"]
|
|
16
|
-
|
|
17
12
|
initializer 'foreman_bootdisk.mount_engine' do |app|
|
|
18
13
|
app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
|
|
19
14
|
end
|
|
@@ -28,113 +23,111 @@ module ForemanBootdisk
|
|
|
28
23
|
Apipie.configuration.checksum_path += ['/bootdisk/api/']
|
|
29
24
|
end
|
|
30
25
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |app|
|
|
27
|
+
app.reloader.to_prepare do
|
|
28
|
+
Foreman::Plugin.register :foreman_bootdisk do
|
|
29
|
+
requires_foreman '>= 3.13'
|
|
30
|
+
# Add Global files for extending foreman-core components and routes
|
|
31
|
+
register_global_js_file 'global'
|
|
32
|
+
register_gettext
|
|
33
|
+
|
|
34
|
+
security_block :bootdisk do |_map|
|
|
35
|
+
permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help bootdisk_options],
|
|
36
|
+
'foreman_bootdisk/subnet_disks': [:subnet],
|
|
37
|
+
'foreman_bootdisk/api/v2/disks': %i[generic host],
|
|
38
|
+
'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
|
|
39
|
+
end
|
|
36
40
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
requires_foreman '>= 3.7'
|
|
40
|
-
# Add Global files for extending foreman-core components and routes
|
|
41
|
-
register_global_js_file 'global'
|
|
42
|
-
register_gettext
|
|
43
|
-
|
|
44
|
-
security_block :bootdisk do |_map|
|
|
45
|
-
permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help bootdisk_options],
|
|
46
|
-
'foreman_bootdisk/subnet_disks': [:subnet],
|
|
47
|
-
'foreman_bootdisk/api/v2/disks': %i[generic host],
|
|
48
|
-
'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
|
|
49
|
-
end
|
|
41
|
+
role 'Boot disk access', [:download_bootdisk], 'Role granting permissions to download bootdisks'
|
|
42
|
+
add_all_permissions_to_default_roles
|
|
50
43
|
|
|
51
|
-
|
|
52
|
-
|
|
44
|
+
apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
|
|
45
|
+
ApipieDSL.configuration.dsl_classes_matchers += [
|
|
46
|
+
"#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
|
|
47
|
+
]
|
|
53
48
|
|
|
54
|
-
|
|
55
|
-
ApipieDSL.configuration.dsl_classes_matchers += [
|
|
56
|
-
"#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
|
|
57
|
-
]
|
|
58
|
-
provision_method 'bootdisk', N_('Boot disk based')
|
|
59
|
-
allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
|
|
49
|
+
provision_method 'bootdisk', N_('Boot disk based')
|
|
60
50
|
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
51
|
+
extend_template_helpers ForemanBootdisk::TemplateHelpers
|
|
52
|
+
|
|
53
|
+
extend_page "subnets/index" do |cx|
|
|
54
|
+
cx.add_pagelet :subnet_index_action_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_action_buttons'
|
|
55
|
+
cx.add_pagelet :subnet_index_title_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_title_buttons'
|
|
56
|
+
end
|
|
65
57
|
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
58
|
+
settings do
|
|
59
|
+
category :bootdisk, N_("Boot disk") do
|
|
60
|
+
ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
|
|
61
|
+
isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
|
|
62
|
+
syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
|
|
63
|
+
grub2 = ['/var/lib/tftpboot/grub2'].find { |p| File.exist?(p) } || '/var/lib/foreman/bootdisk'
|
|
64
|
+
templates = -> {
|
|
65
|
+
Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }]
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
setting "bootdisk_ipxe_dir",
|
|
69
|
+
type: :string,
|
|
70
|
+
default: ipxe,
|
|
71
|
+
full_name: N_("iPXE directory"),
|
|
72
|
+
description: N_("Path to directory containing iPXE images")
|
|
73
|
+
|
|
74
|
+
setting "bootdisk_isolinux_dir",
|
|
75
|
+
type: :string,
|
|
76
|
+
default: isolinux,
|
|
77
|
+
full_name: N_("ISOLINUX directory"),
|
|
78
|
+
description: N_("Path to directory containing isolinux images")
|
|
79
|
+
|
|
80
|
+
setting "bootdisk_syslinux_dir",
|
|
81
|
+
type: :string,
|
|
82
|
+
default: syslinux,
|
|
83
|
+
full_name: N_("SYSLINUX directory"),
|
|
84
|
+
description: N_("Path to directory containing syslinux images")
|
|
85
|
+
|
|
86
|
+
setting "bootdisk_grub2_dir",
|
|
87
|
+
type: :string,
|
|
88
|
+
default: grub2,
|
|
89
|
+
full_name: N_("Grub2 directory"),
|
|
90
|
+
description: N_("Path to directory containing grubx64.efi and shimx64.efi")
|
|
91
|
+
|
|
92
|
+
setting "bootdisk_host_template",
|
|
93
|
+
type: :string,
|
|
94
|
+
collection: templates,
|
|
95
|
+
default: "Boot disk iPXE - host",
|
|
96
|
+
full_name: N_("Host image template"),
|
|
97
|
+
description: N_("iPXE template to use for host-specific boot disks")
|
|
98
|
+
|
|
99
|
+
setting "bootdisk_generic_host_template",
|
|
100
|
+
type: :string,
|
|
101
|
+
collection: templates,
|
|
102
|
+
default: "Boot disk iPXE - generic host",
|
|
103
|
+
full_name: N_("Generic image template"),
|
|
104
|
+
description: N_("iPXE template to use for generic host boot disks")
|
|
105
|
+
|
|
106
|
+
setting "bootdisk_generic_efi_host_template",
|
|
107
|
+
type: :string,
|
|
108
|
+
collection: templates,
|
|
109
|
+
default: "Boot disk Grub2 EFI - generic host",
|
|
110
|
+
full_name: N_("Generic Grub2 EFI image template"),
|
|
111
|
+
description: N_("iPXE template to use for generic EFI host boot disks")
|
|
112
|
+
|
|
113
|
+
setting "bootdisk_mkiso_command",
|
|
114
|
+
type: :string,
|
|
115
|
+
default: "genisoimage",
|
|
116
|
+
full_name: N_("ISO generation command"),
|
|
117
|
+
description: N_("Command to generate ISO image, use genisoimage or mkisofs")
|
|
118
|
+
|
|
119
|
+
setting "bootdisk_cache_media",
|
|
120
|
+
type: :boolean,
|
|
121
|
+
default: true,
|
|
122
|
+
full_name: N_("Installation media caching"),
|
|
123
|
+
description: N_("Installation media files will be cached for full host images")
|
|
124
|
+
|
|
125
|
+
setting "bootdisk_allowed_types",
|
|
126
|
+
type: :array,
|
|
127
|
+
default: Setting::Bootdisk.bootdisk_types,
|
|
128
|
+
full_name: N_("Allowed bootdisk types"),
|
|
129
|
+
description: N_("List of allowed bootdisk types, remove type to disable it")
|
|
130
|
+
end
|
|
138
131
|
end
|
|
139
132
|
end
|
|
140
133
|
end
|
|
@@ -142,6 +135,8 @@ module ForemanBootdisk
|
|
|
142
135
|
|
|
143
136
|
config.to_prepare do
|
|
144
137
|
begin
|
|
138
|
+
::HostsHelper.prepend ForemanBootdisk::HostsHelperExt
|
|
139
|
+
::SubnetsHelper.include ForemanBootdisk::SubnetsHelperExt
|
|
145
140
|
Host::Managed.prepend ForemanBootdisk::HostExt
|
|
146
141
|
Host::Managed.include ForemanBootdisk::Orchestration::Compute
|
|
147
142
|
Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?
|
|
@@ -9,11 +9,6 @@ module ForemanBootdisk
|
|
|
9
9
|
engine_name 'foreman_bootdisk'
|
|
10
10
|
isolate_namespace ForemanBootdisk
|
|
11
11
|
|
|
12
|
-
config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
|
|
13
|
-
config.autoload_paths += Dir["#{config.root}/app/helpers"]
|
|
14
|
-
config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
|
|
15
|
-
config.autoload_paths += Dir["#{config.root}/app/lib"]
|
|
16
|
-
|
|
17
12
|
initializer 'foreman_bootdisk.mount_engine' do |app|
|
|
18
13
|
app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
|
|
19
14
|
end
|
|
@@ -28,118 +23,118 @@ module ForemanBootdisk
|
|
|
28
23
|
Apipie.configuration.checksum_path += ['/bootdisk/api/']
|
|
29
24
|
end
|
|
30
25
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
26
|
+
initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |app|
|
|
27
|
+
app.reloader.to_prepare do
|
|
28
|
+
Foreman::Plugin.register :foreman_bootdisk do
|
|
29
|
+
requires_foreman '>= 3.13'
|
|
30
|
+
# Add Global files for extending foreman-core components and routes
|
|
31
|
+
register_global_js_file 'global'
|
|
32
|
+
register_gettext
|
|
33
|
+
|
|
34
|
+
security_block :bootdisk do |_map|
|
|
35
|
+
permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help bootdisk_options],
|
|
36
|
+
'foreman_bootdisk/subnet_disks': [:subnet],
|
|
37
|
+
'foreman_bootdisk/api/v2/disks': %i[generic host],
|
|
38
|
+
'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
|
|
39
|
+
end
|
|
36
40
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
requires_foreman '>= 3.7'
|
|
40
|
-
<<<<<<< HEAD
|
|
41
|
-
=======
|
|
42
|
-
register_gettext
|
|
43
|
-
|
|
44
|
-
>>>>>>> 4665a6a (Translation improvements)
|
|
45
|
-
# Add Global files for extending foreman-core components and routes
|
|
46
|
-
register_global_js_file 'global'
|
|
47
|
-
register_gettext
|
|
48
|
-
|
|
49
|
-
security_block :bootdisk do |_map|
|
|
50
|
-
permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help bootdisk_options],
|
|
51
|
-
'foreman_bootdisk/subnet_disks': [:subnet],
|
|
52
|
-
'foreman_bootdisk/api/v2/disks': %i[generic host],
|
|
53
|
-
'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
|
|
54
|
-
end
|
|
41
|
+
role 'Boot disk access', [:download_bootdisk], 'Role granting permissions to download bootdisks'
|
|
42
|
+
add_all_permissions_to_default_roles
|
|
55
43
|
|
|
56
|
-
|
|
57
|
-
|
|
44
|
+
apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
|
|
45
|
+
ApipieDSL.configuration.dsl_classes_matchers += [
|
|
46
|
+
"#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
|
|
47
|
+
]
|
|
48
|
+
provision_method 'bootdisk', N_('Boot disk based')
|
|
49
|
+
allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
|
|
58
50
|
|
|
51
|
+
<<<<<<< HEAD
|
|
52
|
+
extend_page "subnets/index" do |cx|
|
|
53
|
+
cx.add_pagelet :subnet_index_action_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_action_buttons'
|
|
54
|
+
cx.add_pagelet :subnet_index_title_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_title_buttons'
|
|
55
|
+
end
|
|
56
|
+
=======
|
|
59
57
|
apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
|
|
60
58
|
ApipieDSL.configuration.dsl_classes_matchers += [
|
|
61
59
|
"#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
|
|
62
60
|
]
|
|
63
61
|
provision_method 'bootdisk', N_('Boot disk based')
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
default: Setting::Bootdisk.bootdisk_types,
|
|
141
|
-
full_name: N_("Allowed bootdisk types"),
|
|
142
|
-
description: N_("List of allowed bootdisk types, remove type to disable it")
|
|
62
|
+
extend_template_helpers ForemanBootdisk::TemplateHelpers
|
|
63
|
+
>>>>>>> 968ca20 (Fixes #37792 - Safe mode and bootdisk_* template helpers)
|
|
64
|
+
|
|
65
|
+
settings do
|
|
66
|
+
category :bootdisk, N_("Boot disk") do
|
|
67
|
+
ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
|
|
68
|
+
isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
|
|
69
|
+
syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
|
|
70
|
+
grub2 = ['/var/lib/tftpboot/grub2'].find { |p| File.exist?(p) } || '/var/lib/foreman/bootdisk'
|
|
71
|
+
templates = -> {
|
|
72
|
+
Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }]
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
setting "bootdisk_ipxe_dir",
|
|
76
|
+
type: :string,
|
|
77
|
+
default: ipxe,
|
|
78
|
+
full_name: N_("iPXE directory"),
|
|
79
|
+
description: N_("Path to directory containing iPXE images")
|
|
80
|
+
|
|
81
|
+
setting "bootdisk_isolinux_dir",
|
|
82
|
+
type: :string,
|
|
83
|
+
default: isolinux,
|
|
84
|
+
full_name: N_("ISOLINUX directory"),
|
|
85
|
+
description: N_("Path to directory containing isolinux images")
|
|
86
|
+
|
|
87
|
+
setting "bootdisk_syslinux_dir",
|
|
88
|
+
type: :string,
|
|
89
|
+
default: syslinux,
|
|
90
|
+
full_name: N_("SYSLINUX directory"),
|
|
91
|
+
description: N_("Path to directory containing syslinux images")
|
|
92
|
+
|
|
93
|
+
setting "bootdisk_grub2_dir",
|
|
94
|
+
type: :string,
|
|
95
|
+
default: grub2,
|
|
96
|
+
full_name: N_("Grub2 directory"),
|
|
97
|
+
description: N_("Path to directory containing grubx64.efi and shimx64.efi")
|
|
98
|
+
|
|
99
|
+
setting "bootdisk_host_template",
|
|
100
|
+
type: :string,
|
|
101
|
+
collection: templates,
|
|
102
|
+
default: "Boot disk iPXE - host",
|
|
103
|
+
full_name: N_("Host image template"),
|
|
104
|
+
description: N_("iPXE template to use for host-specific boot disks")
|
|
105
|
+
|
|
106
|
+
setting "bootdisk_generic_host_template",
|
|
107
|
+
type: :string,
|
|
108
|
+
collection: templates,
|
|
109
|
+
default: "Boot disk iPXE - generic host",
|
|
110
|
+
full_name: N_("Generic image template"),
|
|
111
|
+
description: N_("iPXE template to use for generic host boot disks")
|
|
112
|
+
|
|
113
|
+
setting "bootdisk_generic_efi_host_template",
|
|
114
|
+
type: :string,
|
|
115
|
+
collection: templates,
|
|
116
|
+
default: "Boot disk Grub2 EFI - generic host",
|
|
117
|
+
full_name: N_("Generic Grub2 EFI image template"),
|
|
118
|
+
description: N_("iPXE template to use for generic EFI host boot disks")
|
|
119
|
+
|
|
120
|
+
setting "bootdisk_mkiso_command",
|
|
121
|
+
type: :string,
|
|
122
|
+
default: "genisoimage",
|
|
123
|
+
full_name: N_("ISO generation command"),
|
|
124
|
+
description: N_("Command to generate ISO image, use genisoimage or mkisofs")
|
|
125
|
+
|
|
126
|
+
setting "bootdisk_cache_media",
|
|
127
|
+
type: :boolean,
|
|
128
|
+
default: true,
|
|
129
|
+
full_name: N_("Installation media caching"),
|
|
130
|
+
description: N_("Installation media files will be cached for full host images")
|
|
131
|
+
|
|
132
|
+
setting "bootdisk_allowed_types",
|
|
133
|
+
type: :array,
|
|
134
|
+
default: Setting::Bootdisk.bootdisk_types,
|
|
135
|
+
full_name: N_("Allowed bootdisk types"),
|
|
136
|
+
description: N_("List of allowed bootdisk types, remove type to disable it")
|
|
137
|
+
end
|
|
143
138
|
end
|
|
144
139
|
end
|
|
145
140
|
end
|
|
@@ -147,6 +142,8 @@ module ForemanBootdisk
|
|
|
147
142
|
|
|
148
143
|
config.to_prepare do
|
|
149
144
|
begin
|
|
145
|
+
::HostsHelper.prepend ForemanBootdisk::HostsHelperExt
|
|
146
|
+
::SubnetsHelper.include ForemanBootdisk::SubnetsHelperExt
|
|
150
147
|
Host::Managed.prepend ForemanBootdisk::HostExt
|
|
151
148
|
Host::Managed.include ForemanBootdisk::Orchestration::Compute
|
|
152
149
|
Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?
|
data/locale/Makefile
CHANGED
|
@@ -31,9 +31,16 @@ all-mo: $(MOFILES)
|
|
|
31
31
|
cat $@
|
|
32
32
|
! grep -q msgid $@
|
|
33
33
|
|
|
34
|
-
%.edit.po:
|
|
34
|
+
%.edit.po: %.po.time_stamp
|
|
35
35
|
touch $@
|
|
36
36
|
|
|
37
|
+
# gettext will trash the .edit.po file if the time stamp doesn't exist or is older than the po file
|
|
38
|
+
%.po.time_stamp: %.po
|
|
39
|
+
touch --reference $< $@
|
|
40
|
+
|
|
41
|
+
# Prevent make from treating this as an intermediate file to be cleaned up
|
|
42
|
+
.PRECIOUS: %.po.time_stamp
|
|
43
|
+
|
|
37
44
|
check: $(POXFILES)
|
|
38
45
|
|
|
39
46
|
# Unify duplicate translations
|
|
@@ -43,7 +50,10 @@ uniq-po:
|
|
|
43
50
|
done
|
|
44
51
|
|
|
45
52
|
tx-pull: $(EDITFILES)
|
|
46
|
-
|
|
53
|
+
# Initialize new languages
|
|
54
|
+
cd .. && tx pull -f --all --minimum-perc 50
|
|
55
|
+
# Force update all existing languages
|
|
56
|
+
cd .. && tx pull -f --minimum-perc 0
|
|
47
57
|
for f in $(EDITFILES) ; do \
|
|
48
58
|
sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
|
|
49
59
|
done
|
|
Binary file
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
|
|
8
8
|
msgid ""
|
|
9
9
|
msgstr ""
|
|
10
|
-
"Project-Id-Version: foreman_bootdisk 21.
|
|
10
|
+
"Project-Id-Version: foreman_bootdisk 21.0.4\n"
|
|
11
11
|
"Report-Msgid-Bugs-To: \n"
|
|
12
12
|
"PO-Revision-Date: 2014-02-13 12:12+0000\n"
|
|
13
13
|
"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017\n"
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
|
|
8
8
|
msgid ""
|
|
9
9
|
msgstr ""
|
|
10
|
-
"Project-Id-Version: foreman_bootdisk
|
|
10
|
+
"Project-Id-Version: foreman_bootdisk 22.0.0\n"
|
|
11
11
|
"Report-Msgid-Bugs-To: \n"
|
|
12
12
|
"PO-Revision-Date: 2014-02-13 12:12+0000\n"
|
|
13
13
|
"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017\n"
|
|
@@ -25,9 +25,6 @@ msgstr ""
|
|
|
25
25
|
msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk. This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
|
|
26
26
|
msgstr ""
|
|
27
27
|
|
|
28
|
-
msgid "Action with sub plans"
|
|
29
|
-
msgstr ""
|
|
30
|
-
|
|
31
28
|
msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
|
|
32
29
|
msgstr ""
|
|
33
30
|
|
|
@@ -160,12 +157,6 @@ msgstr ""
|
|
|
160
157
|
msgid "ISOLINUX directory"
|
|
161
158
|
msgstr ""
|
|
162
159
|
|
|
163
|
-
msgid "Import Puppet classes"
|
|
164
|
-
msgstr ""
|
|
165
|
-
|
|
166
|
-
msgid "Import facts"
|
|
167
|
-
msgstr ""
|
|
168
|
-
|
|
169
160
|
msgid "Installation media caching"
|
|
170
161
|
msgstr ""
|
|
171
162
|
|
|
@@ -205,9 +196,6 @@ msgstr ""
|
|
|
205
196
|
msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
|
|
206
197
|
msgstr ""
|
|
207
198
|
|
|
208
|
-
msgid "Remote action:"
|
|
209
|
-
msgstr ""
|
|
210
|
-
|
|
211
199
|
msgid "SYSLINUX directory"
|
|
212
200
|
msgstr ""
|
|
213
201
|
|
|
Binary file
|