foreman_puppet 5.1.1 → 5.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/concerns/foreman_puppet/extensions/host.rb +1 -1
- data/app/views/foreman_puppet/common/_puppetclasses_or_envs_changed.html.erb +5 -0
- data/app/views/foreman_puppet/environments/welcome.html.erb +5 -0
- data/app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb +1 -1
- data/app/views/foreman_puppet/puppetclasses/_selected_classes.html.erb +6 -1
- data/app/views/hosts/select_multiple_puppet_proxy.html.erb +5 -0
- data/app/views/smart_proxies/plugins/_puppet.html.erb +1 -2
- data/lib/foreman_puppet/version.rb +1 -1
- data/locale/ca/foreman_puppet.edit.po +32 -27
- data/locale/cs_CZ/foreman_puppet.edit.po +36 -40
- data/locale/de/foreman_puppet.edit.po +36 -40
- data/locale/en/foreman_puppet.edit.po +32 -24
- data/locale/en_GB/foreman_puppet.edit.po +36 -37
- data/locale/es/foreman_puppet.edit.po +36 -40
- data/locale/fr/foreman_puppet.edit.po +36 -53
- data/locale/gl/foreman_puppet.edit.po +32 -24
- data/locale/it/foreman_puppet.edit.po +36 -37
- data/locale/ja/foreman_puppet.edit.po +36 -51
- data/locale/ka/foreman_puppet.edit.po +36 -53
- data/locale/ko/foreman_puppet.edit.po +36 -40
- data/locale/nl_NL/foreman_puppet.edit.po +32 -24
- data/locale/pl/foreman_puppet.edit.po +32 -24
- data/locale/pt_BR/foreman_puppet.edit.po +36 -40
- data/locale/ru/foreman_puppet.edit.po +36 -40
- data/locale/sv_SE/foreman_puppet.edit.po +32 -24
- data/locale/zh_CN/foreman_puppet.edit.po +36 -50
- data/locale/zh_TW/foreman_puppet.edit.po +36 -40
- data/webpack/src/Components/Environments/Welcome.js +1 -1
- data/webpack/src/Extends/Host/PuppetTab/index.js +1 -0
- data/webpack/src/foreman_puppet_host_form.js +3 -0
- metadata +10 -9
@@ -196,7 +196,7 @@ msgstr[1] ""
|
|
196
196
|
msgid "The %{proxy_type} proxy of the selected hosts was set to %{proxy_name}."
|
197
197
|
msgstr "所選主機的 %{proxy_type} 代理已設為 %{proxy_name}。"
|
198
198
|
|
199
|
-
#: ../app/controllers/concerns/foreman_puppet/extensions/hosts_controller_extensions.rb:204 ../lib/foreman_puppet/register.rb:
|
199
|
+
#: ../app/controllers/concerns/foreman_puppet/extensions/hosts_controller_extensions.rb:204 ../lib/foreman_puppet/register.rb:231 ../webpack/src/Extends/Fills/index.js:12
|
200
200
|
msgid "Puppet"
|
201
201
|
msgstr "Puppet"
|
202
202
|
|
@@ -756,7 +756,7 @@ msgstr "可用的配置群組"
|
|
756
756
|
msgid "Edit %s"
|
757
757
|
msgstr "編輯 %s"
|
758
758
|
|
759
|
-
#: ../app/views/foreman_puppet/config_groups/index.html.erb:3 ../app/views/foreman_puppet/config_groups/welcome.html.erb:1 ../app/views/foreman_puppet/config_groups/welcome.html.erb:9 ../lib/foreman_puppet/register.rb:
|
759
|
+
#: ../app/views/foreman_puppet/config_groups/index.html.erb:3 ../app/views/foreman_puppet/config_groups/welcome.html.erb:1 ../app/views/foreman_puppet/config_groups/welcome.html.erb:9 ../lib/foreman_puppet/register.rb:174
|
760
760
|
msgid "Config Groups"
|
761
761
|
msgstr ""
|
762
762
|
|
@@ -796,7 +796,7 @@ msgstr "位置"
|
|
796
796
|
msgid "Organizations"
|
797
797
|
msgstr "組織"
|
798
798
|
|
799
|
-
#: ../app/views/foreman_puppet/environments/edit.html.erb:5 ../app/views/foreman_puppet/environments/index.html.erb:1 ../app/views/foreman_puppet/environments/new.html.erb:4
|
799
|
+
#: ../app/views/foreman_puppet/environments/edit.html.erb:5 ../app/views/foreman_puppet/environments/index.html.erb:1 ../app/views/foreman_puppet/environments/new.html.erb:4 ../app/views/foreman_puppet/environments/welcome.html.erb:4 ../webpack/src/Components/Environments/Welcome.js:40
|
800
800
|
msgid "Puppet Environments"
|
801
801
|
msgstr "Puppet 環境"
|
802
802
|
|
@@ -804,7 +804,7 @@ msgstr "Puppet 環境"
|
|
804
804
|
msgid "Environment|Name"
|
805
805
|
msgstr "名稱"
|
806
806
|
|
807
|
-
#: ../app/views/foreman_puppet/environments/index.html.erb:22 ../lib/foreman_puppet/register.rb:
|
807
|
+
#: ../app/views/foreman_puppet/environments/index.html.erb:22 ../lib/foreman_puppet/register.rb:171
|
808
808
|
msgid "Classes"
|
809
809
|
msgstr "類別"
|
810
810
|
|
@@ -832,7 +832,7 @@ msgstr "找不到環境"
|
|
832
832
|
msgid "There are no puppet environments set up on this puppet master. Please check the puppet master configuration."
|
833
833
|
msgstr "此 puppet master 上並未設定 puppet 環境。請檢查 puppet master 的配置。"
|
834
834
|
|
835
|
-
#: ../app/views/foreman_puppet/puppetclass_lookup_keys/index.html.erb:1 ../app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb:1 ../app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb:8 ../lib/foreman_puppet/register.rb:
|
835
|
+
#: ../app/views/foreman_puppet/puppetclass_lookup_keys/index.html.erb:1 ../app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb:1 ../app/views/foreman_puppet/puppetclass_lookup_keys/welcome.html.erb:8 ../lib/foreman_puppet/register.rb:177
|
836
836
|
msgid "Smart Class Parameters"
|
837
837
|
msgstr ""
|
838
838
|
|
@@ -928,7 +928,7 @@ msgstr "編輯 Puppet 類別 %s"
|
|
928
928
|
msgid "Puppetclass|Name"
|
929
929
|
msgstr "名稱"
|
930
930
|
|
931
|
-
#: ../app/views/foreman_puppet/puppetclasses/index.html.erb:10 ../app/views/smart_proxies/plugins/_puppet.html.erb:4 ../lib/foreman_puppet/register.rb:
|
931
|
+
#: ../app/views/foreman_puppet/puppetclasses/index.html.erb:10 ../app/views/smart_proxies/plugins/_puppet.html.erb:4 ../lib/foreman_puppet/register.rb:168
|
932
932
|
msgid "Environments"
|
933
933
|
msgstr "環境"
|
934
934
|
|
@@ -1000,59 +1000,59 @@ msgstr "一般"
|
|
1000
1000
|
msgid "Hosts managed:"
|
1001
1001
|
msgstr "受管理的主機:"
|
1002
1002
|
|
1003
|
-
#: ../lib/foreman_puppet/register.rb:
|
1003
|
+
#: ../lib/foreman_puppet/register.rb:9
|
1004
1004
|
msgid "Facts"
|
1005
1005
|
msgstr "詳情"
|
1006
1006
|
|
1007
|
-
#: ../lib/foreman_puppet/register.rb:
|
1007
|
+
#: ../lib/foreman_puppet/register.rb:12
|
1008
1008
|
msgid "Foreman will default to this puppet environment if it cannot auto detect one"
|
1009
1009
|
msgstr "若 Foreman 無法自動偵測 puppet 環境,就預設值它將會使用此 puppet 環境"
|
1010
1010
|
|
1011
|
-
#: ../lib/foreman_puppet/register.rb:
|
1011
|
+
#: ../lib/foreman_puppet/register.rb:14
|
1012
1012
|
msgid "Default Puppet environment"
|
1013
1013
|
msgstr "預設 Puppet 環境"
|
1014
1014
|
|
1015
|
-
#: ../lib/foreman_puppet/register.rb:
|
1015
|
+
#: ../lib/foreman_puppet/register.rb:18
|
1016
1016
|
msgid "Foreman will explicitly set the puppet environment in the ENC yaml output. This will avoid conflicts between the environment in puppet.conf and the environment set in Foreman"
|
1017
1017
|
msgstr "Foreman 將會明確設置 puppet 環境於 ENC yaml 輸出中。這將避免 puppet.conf 和 Foreman 中,環境之間的衝突。"
|
1018
1018
|
|
1019
|
-
#: ../lib/foreman_puppet/register.rb:
|
1019
|
+
#: ../lib/foreman_puppet/register.rb:21
|
1020
1020
|
msgid "ENC environment"
|
1021
1021
|
msgstr "ENC 環境"
|
1022
1022
|
|
1023
|
-
#: ../lib/foreman_puppet/register.rb:
|
1023
|
+
#: ../lib/foreman_puppet/register.rb:24
|
1024
1024
|
msgid "Foreman will update a host's environment from its facts"
|
1025
1025
|
msgstr "Foreman 會藉由主機的環境之詳情來更新它"
|
1026
1026
|
|
1027
|
-
#: ../lib/foreman_puppet/register.rb:
|
1027
|
+
#: ../lib/foreman_puppet/register.rb:26
|
1028
1028
|
msgid "Update environment from facts"
|
1029
1029
|
msgstr "從詳情升級環境"
|
1030
1030
|
|
1031
|
-
#: ../lib/foreman_puppet/register.rb:
|
1031
|
+
#: ../lib/foreman_puppet/register.rb:29
|
1032
1032
|
msgid "Config Management"
|
1033
1033
|
msgstr ""
|
1034
1034
|
|
1035
|
-
#: ../lib/foreman_puppet/register.rb:
|
1035
|
+
#: ../lib/foreman_puppet/register.rb:32
|
1036
1036
|
msgid "Duration in minutes after servers reporting via Puppet are classed as out of sync."
|
1037
1037
|
msgstr ""
|
1038
1038
|
|
1039
|
-
#: ../lib/foreman_puppet/register.rb:
|
1039
|
+
#: ../lib/foreman_puppet/register.rb:34
|
1040
1040
|
msgid "Puppet interval"
|
1041
1041
|
msgstr "Puppet 間隔"
|
1042
1042
|
|
1043
|
-
#: ../lib/foreman_puppet/register.rb:
|
1043
|
+
#: ../lib/foreman_puppet/register.rb:37
|
1044
1044
|
msgid "Disable host configuration status turning to out of sync for %s after report does not arrive within configured interval"
|
1045
1045
|
msgstr ""
|
1046
1046
|
|
1047
|
-
#: ../lib/foreman_puppet/register.rb:
|
1047
|
+
#: ../lib/foreman_puppet/register.rb:39
|
1048
1048
|
msgid "%s out of sync disabled"
|
1049
1049
|
msgstr ""
|
1050
1050
|
|
1051
|
-
#: ../lib/foreman_puppet/register.rb:
|
1051
|
+
#: ../lib/foreman_puppet/register.rb:165 ../lib/foreman_puppet/register.rb:218
|
1052
1052
|
msgid "Puppet ENC"
|
1053
1053
|
msgstr ""
|
1054
1054
|
|
1055
|
-
#: ../lib/foreman_puppet/register.rb:
|
1055
|
+
#: ../lib/foreman_puppet/register.rb:232
|
1056
1056
|
msgid "Puppet env"
|
1057
1057
|
msgstr ""
|
1058
1058
|
|
@@ -1076,6 +1076,14 @@ msgstr ""
|
|
1076
1076
|
msgid "Smart class parameters"
|
1077
1077
|
msgstr "智慧類別參數"
|
1078
1078
|
|
1079
|
+
#: ../webpack/src/Extends/Host/PuppetTab/SubTabs/ENCPreview/ENCTab.js:43
|
1080
|
+
msgid "Successfully copied to clipboard!"
|
1081
|
+
msgstr ""
|
1082
|
+
|
1083
|
+
#: ../webpack/src/Extends/Host/PuppetTab/SubTabs/ENCPreview/ENCTab.js:44
|
1084
|
+
msgid "Copy to clipboard"
|
1085
|
+
msgstr ""
|
1086
|
+
|
1079
1087
|
#: ../webpack/src/Extends/Host/PuppetTab/SubTabs/ENCPreview/index.js:28
|
1080
1088
|
msgid "Couldn't find any ENC data for this host"
|
1081
1089
|
msgstr ""
|
@@ -1125,33 +1133,21 @@ msgid "Some Puppet Classes are unavailable in the selected environment"
|
|
1125
1133
|
msgstr ""
|
1126
1134
|
|
1127
1135
|
#: action_names.rb:2
|
1128
|
-
msgid "
|
1129
|
-
msgstr "
|
1136
|
+
msgid "Action with sub plans"
|
1137
|
+
msgstr "有子計畫的動作"
|
1130
1138
|
|
1131
1139
|
#: action_names.rb:3
|
1132
|
-
msgid "
|
1133
|
-
msgstr ""
|
1140
|
+
msgid "Import facts"
|
1141
|
+
msgstr "匯入詳情"
|
1134
1142
|
|
1135
1143
|
#: action_names.rb:4
|
1136
|
-
msgid "
|
1137
|
-
msgstr ""
|
1144
|
+
msgid "Import Puppet classes"
|
1145
|
+
msgstr "匯入 Puppet 類別"
|
1138
1146
|
|
1139
1147
|
#: action_names.rb:5
|
1140
|
-
msgid "
|
1141
|
-
msgstr ""
|
1148
|
+
msgid "Remote action:"
|
1149
|
+
msgstr "遠端動作:"
|
1142
1150
|
|
1143
1151
|
#: gemspec.rb:2
|
1144
1152
|
msgid "Allow assigning Puppet environments and classes to the Foreman Hosts."
|
1145
1153
|
msgstr ""
|
1146
|
-
|
1147
|
-
#~ msgid "Action with sub plans"
|
1148
|
-
#~ msgstr "有子計畫的動作"
|
1149
|
-
|
1150
|
-
#~ msgid "Environment name"
|
1151
|
-
#~ msgstr "環境名稱"
|
1152
|
-
|
1153
|
-
#~ msgid "Import Puppet classes"
|
1154
|
-
#~ msgstr "匯入 Puppet 類別"
|
1155
|
-
|
1156
|
-
#~ msgid "Import facts"
|
1157
|
-
#~ msgstr "匯入詳情"
|
@@ -37,7 +37,7 @@ export const WelcomeEnv = ({ canCreate }) => {
|
|
37
37
|
<EmptyState
|
38
38
|
icon="th"
|
39
39
|
iconType="fa"
|
40
|
-
header={__('Environments')}
|
40
|
+
header={__(' Puppet Environments')}
|
41
41
|
description={description}
|
42
42
|
documentation={{ url: getManualURL('4.2.1Environments') }}
|
43
43
|
action={action}
|
@@ -82,6 +82,9 @@ export function updatePuppetclasses(element) {
|
|
82
82
|
export function reloadPuppetclassParams() {
|
83
83
|
const hostId = $('form.hostresource-form').data('id');
|
84
84
|
const url = $('#puppet_klasses_parameters').data('url');
|
85
|
+
if (!url) {
|
86
|
+
return;
|
87
|
+
}
|
85
88
|
let data = window.serializeForm().replace('method=patch', 'method=post');
|
86
89
|
if (url.match('hostgroups')) {
|
87
90
|
data += `&hostgroup_id=${hostId}`;
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_puppet
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.1.
|
4
|
+
version: 5.1.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ondřej Ezr
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2023-
|
12
|
+
date: 2023-09-14 00:00:00.000000000 Z
|
13
13
|
dependencies: []
|
14
14
|
description: Allow assigning Puppet environments and classes to the Foreman Hosts.
|
15
15
|
email:
|
@@ -173,6 +173,7 @@ files:
|
|
173
173
|
- app/views/hosts/foreman_puppet/_form_list_env_field_header.html.erb
|
174
174
|
- app/views/hosts/foreman_puppet/_form_main_tab_fields.html.erb
|
175
175
|
- app/views/hosts/select_multiple_environment.html.erb
|
176
|
+
- app/views/hosts/select_multiple_puppet_proxy.html.erb
|
176
177
|
- app/views/provisioning_templates/_combination.html.erb
|
177
178
|
- app/views/provisioning_templates/_combinations.html.erb
|
178
179
|
- app/views/smart_proxies/plugins/_puppet.html.erb
|
@@ -431,9 +432,9 @@ test_files:
|
|
431
432
|
- test/controllers/foreman_puppet/api/v2/smart_proxies_controller_test.rb
|
432
433
|
- test/controllers/foreman_puppet/api/v2/template_combinations_controller_test.rb
|
433
434
|
- test/controllers/foreman_puppet/api/v2/environments_controller_test.rb
|
435
|
+
- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
|
434
436
|
- test/controllers/foreman_puppet/api/v2/hosts_controller_test.rb
|
435
437
|
- test/controllers/foreman_puppet/api/v2/override_values_controller_test.rb
|
436
|
-
- test/controllers/foreman_puppet/api/v2/smart_class_parameters_controller_test.rb
|
437
438
|
- test/controllers/foreman_puppet/config_groups_controller_test.rb
|
438
439
|
- test/controllers/foreman_puppet/hostgroups_controller_test.rb
|
439
440
|
- test/controllers/foreman_puppet/puppet_smart_proxies_controller_test.rb
|
@@ -455,14 +456,14 @@ test_files:
|
|
455
456
|
- test/graphql/queries/environment_query_test.rb
|
456
457
|
- test/graphql/queries/puppetclass_query_test.rb
|
457
458
|
- test/helpers/foreman_puppet/hosts_and_hostgroups_helper_test.rb
|
458
|
-
- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
|
459
459
|
- test/helpers/foreman_puppet/puppetclasses_helper_test.rb
|
460
|
+
- test/helpers/foreman_puppet/puppetclass_lookup_keys_helper_test.rb
|
460
461
|
- test/integration/foreman_puppet/dashboard_js_test.rb
|
461
462
|
- test/integration/foreman_puppet/environment_js_test.rb
|
462
|
-
- test/integration/foreman_puppet/host_js_test.rb
|
463
463
|
- test/integration/foreman_puppet/hostgroup_js_test.rb
|
464
464
|
- test/integration/foreman_puppet/puppetclass_js_test.rb
|
465
465
|
- test/integration/foreman_puppet/smartclass_parameter_js_test.rb
|
466
|
+
- test/integration/foreman_puppet/host_js_test.rb
|
466
467
|
- test/models/foreman_puppet/config_group_class_test.rb
|
467
468
|
- test/models/foreman_puppet/config_group_test.rb
|
468
469
|
- test/models/foreman_puppet/environment_test.rb
|
@@ -474,18 +475,18 @@ test_files:
|
|
474
475
|
- test/models/foreman_puppet/report_test.rb
|
475
476
|
- test/models/foreman_puppet/smart_proxy_test.rb
|
476
477
|
- test/models/foreman_puppet/user_test.rb
|
477
|
-
- test/models/foreman_puppet/host_puppet_facet_test.rb
|
478
|
-
- test/models/foreman_puppet/host_test.rb
|
479
478
|
- test/models/foreman_puppet/provisioning_template_test.rb
|
480
479
|
- test/models/foreman_puppet/puppetclass_test.rb
|
481
|
-
- test/
|
480
|
+
- test/models/foreman_puppet/host_puppet_facet_test.rb
|
481
|
+
- test/models/foreman_puppet/host_test.rb
|
482
482
|
- test/services/foreman_puppet/host_info_providers/config_groups_info_test.rb
|
483
483
|
- test/services/foreman_puppet/host_info_providers/puppet_info_test.rb
|
484
484
|
- test/services/foreman_puppet/input_type/puppet_parameter_input_test.rb
|
485
|
-
- test/
|
485
|
+
- test/services/foreman_puppet/host_counter_test.rb
|
486
486
|
- test/unit/foreman_puppet/access_permissions_test.rb
|
487
487
|
- test/unit/foreman_puppet/puppet_class_importer_test.rb
|
488
488
|
- test/unit/foreman_puppet/template_rendering_test.rb
|
489
489
|
- test/unit/foreman_puppet/global_id_test.rb
|
490
490
|
- test/unit/foreman_puppet_test.rb
|
491
|
+
- test/test_puppet_helper.rb
|
491
492
|
- test/integration_puppet_helper.rb
|