foreman_acd 0.5.0 → 0.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +82 -86
- data/app/controllers/foreman_acd/ansible_playbooks_controller.rb +13 -11
- data/app/controllers/foreman_acd/api/v2/ansible_playbooks_controller.rb +4 -3
- data/app/controllers/foreman_acd/api/v2/app_definitions_controller.rb +1 -0
- data/app/controllers/foreman_acd/api/v2/app_instances_controller.rb +9 -1
- data/app/controllers/foreman_acd/app_definitions_controller.rb +14 -9
- data/app/controllers/foreman_acd/app_instances_controller.rb +97 -25
- data/app/controllers/foreman_acd/concerns/ansible_playbook_parameters.rb +1 -1
- data/app/controllers/foreman_acd/concerns/app_definition_parameters.rb +1 -1
- data/app/controllers/foreman_acd/concerns/app_instance_parameters.rb +1 -1
- data/app/controllers/foreman_acd/remote_execution_controller.rb +3 -6
- data/app/controllers/ui_acd_controller.rb +9 -0
- data/app/lib/actions/foreman_acd/deploy_all_hosts.rb +42 -0
- data/app/lib/actions/foreman_acd/run_configurator.rb +41 -0
- data/app/models/concerns/foreman_acd/host_managed_extensions.rb +51 -0
- data/app/models/foreman_acd/acd_provider.rb +3 -0
- data/app/models/foreman_acd/ansible_playbook.rb +30 -13
- data/app/models/foreman_acd/app_definition.rb +24 -1
- data/app/models/foreman_acd/app_instance.rb +40 -5
- data/app/models/foreman_acd/foreman_host.rb +23 -0
- data/app/models/foreman_acd/taxonomy_extensions.rb +17 -0
- data/app/services/foreman_acd/app_configurator.rb +7 -10
- data/app/services/foreman_acd/app_deployer.rb +59 -47
- data/app/services/foreman_acd/inventory_creator.rb +12 -25
- data/app/views/foreman_acd/ansible_playbooks/_form.html.erb +11 -2
- data/app/views/foreman_acd/ansible_playbooks/edit.html.erb +9 -1
- data/app/views/foreman_acd/ansible_playbooks/index.html.erb +3 -3
- data/app/views/foreman_acd/api/v2/ansible_playbooks/base.json.rabl +2 -0
- data/app/views/foreman_acd/api/v2/ansible_playbooks/index.json.rabl +2 -0
- data/app/views/foreman_acd/api/v2/ansible_playbooks/show.json.rabl +6 -0
- data/app/views/foreman_acd/api/v2/app_definitions/base.json.rabl +2 -0
- data/app/views/foreman_acd/api/v2/app_definitions/index.json.rabl +2 -0
- data/app/views/foreman_acd/api/v2/app_definitions/show.json.rabl +6 -0
- data/app/views/foreman_acd/api/v2/app_instances/base.json.rabl +3 -1
- data/app/views/foreman_acd/api/v2/app_instances/index.json.rabl +2 -0
- data/app/views/foreman_acd/api/v2/app_instances/show.json.rabl +2 -0
- data/app/views/foreman_acd/app_definitions/_form.html.erb +8 -0
- data/app/views/foreman_acd/app_definitions/edit.html.erb +10 -5
- data/app/views/foreman_acd/app_definitions/index.html.erb +4 -4
- data/app/views/foreman_acd/app_instances/_form.html.erb +3 -3
- data/app/views/foreman_acd/app_instances/edit.html.erb +10 -0
- data/app/views/foreman_acd/app_instances/index.html.erb +87 -14
- data/app/views/foreman_acd/app_instances/report.html.erb +5 -2
- data/app/views/templates/job/run_acd_ansible_playbook.erb +14 -1
- data/app/views/ui_acd/app_definition.json.rabl +1 -1
- data/config/routes.rb +1 -2
- data/db/migrate/20200917120220_add_ansible_playbook_id.rb +1 -1
- data/db/migrate/20201016002819_add_ansible_vars_all_to_app_definitions.rb +3 -0
- data/db/migrate/20201016104338_add_ansible_vars_all_to_app_instances.rb +3 -0
- data/db/migrate/20210112111548_add_organization_to_app_instance.rb +22 -0
- data/db/migrate/20210112113853_add_location_to_app_instance.rb +8 -0
- data/db/migrate/20210202141658_create_foreman_hosts.rb +24 -0
- data/db/migrate/20210204111306_remove_hosts_from_app_instances.rb +8 -0
- data/db/migrate/20210209091014_rename_acd_tables.rb +16 -0
- data/db/migrate/20210216083522_add_last_progress_report.rb +8 -0
- data/db/migrate/20210216091529_add_last_deploy_task.rb +8 -0
- data/db/seeds.d/62_acd_proxy_feature.rb +1 -3
- data/db/seeds.d/75-job_templates.rb +6 -1
- data/lib/foreman_acd/engine.rb +14 -3
- data/lib/foreman_acd/plugin.rb +49 -28
- data/lib/foreman_acd/version.rb +1 -1
- data/locale/en/foreman_acd.edit.po +326 -0
- data/locale/en/foreman_acd.po +232 -2
- data/{app/controllers/foreman_acd/api/v2/app_playbooks_controller.rb → locale/en/foreman_acd.po.time_stamp} +0 -0
- data/locale/foreman_acd.pot +343 -8
- data/test/controllers/ansible_playbooks_controller_test.rb +27 -0
- data/webpack/components/ApplicationDefinition/ApplicationDefinition.js +31 -18
- data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js +8 -0
- data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js +1 -0
- data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js +26 -0
- data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js +1 -0
- data/webpack/components/ApplicationDefinition/index.js +2 -0
- data/webpack/components/ApplicationInstance/ApplicationInstance.js +67 -30
- data/webpack/components/ApplicationInstance/ApplicationInstanceActions.js +8 -0
- data/webpack/components/ApplicationInstance/ApplicationInstanceConstants.js +1 -0
- data/webpack/components/ApplicationInstance/ApplicationInstanceReducer.js +16 -2
- data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js +1 -0
- data/webpack/components/ApplicationInstance/components/Service.js +1 -1
- data/webpack/components/ApplicationInstance/index.js +2 -0
- data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.js +53 -60
- data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.scss +17 -0
- data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportActions.js +7 -51
- data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportConstants.js +2 -4
- data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportReducer.js +4 -18
- data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportSelectors.js +0 -1
- data/webpack/components/ApplicationInstanceReport/components/ReportViewer.js +1 -1
- data/webpack/components/ApplicationInstanceReport/index.js +0 -2
- data/webpack/components/ParameterSelection/ParameterSelection.js +10 -0
- data/webpack/components/ParameterSelection/ParameterSelectionActions.js +8 -7
- data/webpack/components/common/DeleteTableEntry.js +3 -2
- data/webpack/components/common/EditTableEntry.js +2 -1
- data/webpack/components/common/LockTableEntry.js +2 -1
- metadata +48 -6
- data/app/views/foreman_acd/app_instances/deploy.html.erb +0 -19
@@ -4,6 +4,7 @@ import {
|
|
4
4
|
Icon,
|
5
5
|
Button,
|
6
6
|
} from 'patternfly-react';
|
7
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
7
8
|
|
8
9
|
const DeleteTableEntry = ({
|
9
10
|
hidden,
|
@@ -20,9 +21,9 @@ const DeleteTableEntry = ({
|
|
20
21
|
<Button
|
21
22
|
bsStyle="default"
|
22
23
|
disabled={disabled}
|
23
|
-
onClick={() => window.confirm("Are you sure you wish to delete this item?") && onDeleteTableEntry(additionalData) }
|
24
|
+
onClick={() => window.confirm(__("Are you sure you wish to delete this item?")) && onDeleteTableEntry(additionalData) }
|
24
25
|
>
|
25
|
-
<Icon type="pf" name="delete" title="
|
26
|
+
<Icon type="pf" name="delete" title={__("Delete entry")} />
|
26
27
|
</Button>
|
27
28
|
</span>
|
28
29
|
);
|
@@ -4,6 +4,7 @@ import {
|
|
4
4
|
Icon,
|
5
5
|
Button,
|
6
6
|
} from 'patternfly-react';
|
7
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
7
8
|
|
8
9
|
const EditTableEntry = ({
|
9
10
|
hidden,
|
@@ -32,7 +33,7 @@ const EditTableEntry = ({
|
|
32
33
|
disabled={disabled}
|
33
34
|
onClick={() => onEditTableEntry(additionalData) }
|
34
35
|
>
|
35
|
-
<Icon type="pf" name="edit" title={title} />
|
36
|
+
<Icon type="pf" name="edit" title={__(title)} />
|
36
37
|
</Button>
|
37
38
|
</span>
|
38
39
|
);
|
@@ -4,6 +4,7 @@ import {
|
|
4
4
|
Icon,
|
5
5
|
Button,
|
6
6
|
} from 'patternfly-react';
|
7
|
+
import { translate as __ } from 'foremanReact/common/I18n';
|
7
8
|
|
8
9
|
const LockTableEntry = ({
|
9
10
|
hidden,
|
@@ -43,7 +44,7 @@ const LockTableEntry = ({
|
|
43
44
|
disabled={disabled}
|
44
45
|
onClick={() => onLockTableEntry(additionalData) }
|
45
46
|
>
|
46
|
-
<Icon type="pf" name={lockButton} title={lockButtonTitle} />
|
47
|
+
<Icon type="pf" name={lockButton} title={__(lockButtonTitle)} />
|
47
48
|
</Button>
|
48
49
|
</span>
|
49
50
|
);
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_acd
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- ATIX AG
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-03-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rubocop
|
@@ -16,14 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.87.0
|
20
20
|
type: :development
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
26
|
+
version: 0.87.0
|
27
|
+
- !ruby/object:Gem::Dependency
|
28
|
+
name: rubocop-rails
|
29
|
+
requirement: !ruby/object:Gem::Requirement
|
30
|
+
requirements:
|
31
|
+
- - "~>"
|
32
|
+
- !ruby/object:Gem::Version
|
33
|
+
version: 2.7.1
|
34
|
+
type: :development
|
35
|
+
prerelease: false
|
36
|
+
version_requirements: !ruby/object:Gem::Requirement
|
37
|
+
requirements:
|
38
|
+
- - "~>"
|
39
|
+
- !ruby/object:Gem::Version
|
40
|
+
version: 2.7.1
|
27
41
|
- !ruby/object:Gem::Dependency
|
28
42
|
name: foreman_remote_execution
|
29
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -38,6 +52,20 @@ dependencies:
|
|
38
52
|
- - ">="
|
39
53
|
- !ruby/object:Gem::Version
|
40
54
|
version: 3.3.0
|
55
|
+
- !ruby/object:Gem::Dependency
|
56
|
+
name: foreman-tasks
|
57
|
+
requirement: !ruby/object:Gem::Requirement
|
58
|
+
requirements:
|
59
|
+
- - ">="
|
60
|
+
- !ruby/object:Gem::Version
|
61
|
+
version: '0.10'
|
62
|
+
type: :runtime
|
63
|
+
prerelease: false
|
64
|
+
version_requirements: !ruby/object:Gem::Requirement
|
65
|
+
requirements:
|
66
|
+
- - ">="
|
67
|
+
- !ruby/object:Gem::Version
|
68
|
+
version: '0.10'
|
41
69
|
description: Foreman plugin to provide application centric deployment and self service
|
42
70
|
portal
|
43
71
|
email:
|
@@ -54,7 +82,6 @@ files:
|
|
54
82
|
- app/controllers/foreman_acd/api/v2/ansible_playbooks_controller.rb
|
55
83
|
- app/controllers/foreman_acd/api/v2/app_definitions_controller.rb
|
56
84
|
- app/controllers/foreman_acd/api/v2/app_instances_controller.rb
|
57
|
-
- app/controllers/foreman_acd/api/v2/app_playbooks_controller.rb
|
58
85
|
- app/controllers/foreman_acd/api/v2/base_controller.rb
|
59
86
|
- app/controllers/foreman_acd/app_definitions_controller.rb
|
60
87
|
- app/controllers/foreman_acd/app_instances_controller.rb
|
@@ -64,10 +91,15 @@ files:
|
|
64
91
|
- app/controllers/foreman_acd/concerns/app_instance_parameters.rb
|
65
92
|
- app/controllers/foreman_acd/remote_execution_controller.rb
|
66
93
|
- app/controllers/ui_acd_controller.rb
|
94
|
+
- app/lib/actions/foreman_acd/deploy_all_hosts.rb
|
95
|
+
- app/lib/actions/foreman_acd/run_configurator.rb
|
96
|
+
- app/models/concerns/foreman_acd/host_managed_extensions.rb
|
67
97
|
- app/models/foreman_acd/acd_provider.rb
|
68
98
|
- app/models/foreman_acd/ansible_playbook.rb
|
69
99
|
- app/models/foreman_acd/app_definition.rb
|
70
100
|
- app/models/foreman_acd/app_instance.rb
|
101
|
+
- app/models/foreman_acd/foreman_host.rb
|
102
|
+
- app/models/foreman_acd/taxonomy_extensions.rb
|
71
103
|
- app/services/foreman_acd/app_configurator.rb
|
72
104
|
- app/services/foreman_acd/app_deployer.rb
|
73
105
|
- app/services/foreman_acd/inventory_creator.rb
|
@@ -90,7 +122,6 @@ files:
|
|
90
122
|
- app/views/foreman_acd/app_definitions/index.html.erb
|
91
123
|
- app/views/foreman_acd/app_definitions/new.html.erb
|
92
124
|
- app/views/foreman_acd/app_instances/_form.html.erb
|
93
|
-
- app/views/foreman_acd/app_instances/deploy.html.erb
|
94
125
|
- app/views/foreman_acd/app_instances/edit.html.erb
|
95
126
|
- app/views/foreman_acd/app_instances/index.html.erb
|
96
127
|
- app/views/foreman_acd/app_instances/new.html.erb
|
@@ -112,6 +143,13 @@ files:
|
|
112
143
|
- db/migrate/20200917120220_add_ansible_playbook_id.rb
|
113
144
|
- db/migrate/20201016002819_add_ansible_vars_all_to_app_definitions.rb
|
114
145
|
- db/migrate/20201016104338_add_ansible_vars_all_to_app_instances.rb
|
146
|
+
- db/migrate/20210112111548_add_organization_to_app_instance.rb
|
147
|
+
- db/migrate/20210112113853_add_location_to_app_instance.rb
|
148
|
+
- db/migrate/20210202141658_create_foreman_hosts.rb
|
149
|
+
- db/migrate/20210204111306_remove_hosts_from_app_instances.rb
|
150
|
+
- db/migrate/20210209091014_rename_acd_tables.rb
|
151
|
+
- db/migrate/20210216083522_add_last_progress_report.rb
|
152
|
+
- db/migrate/20210216091529_add_last_deploy_task.rb
|
115
153
|
- db/seeds.d/62_acd_proxy_feature.rb
|
116
154
|
- db/seeds.d/75-job_templates.rb
|
117
155
|
- lib/foreman_acd.rb
|
@@ -120,10 +158,13 @@ files:
|
|
120
158
|
- lib/foreman_acd/version.rb
|
121
159
|
- lib/tasks/foreman_acd_tasks.rake
|
122
160
|
- locale/Makefile
|
161
|
+
- locale/en/foreman_acd.edit.po
|
123
162
|
- locale/en/foreman_acd.po
|
163
|
+
- locale/en/foreman_acd.po.time_stamp
|
124
164
|
- locale/foreman_acd.pot
|
125
165
|
- locale/gemspec.rb
|
126
166
|
- package.json
|
167
|
+
- test/controllers/ansible_playbooks_controller_test.rb
|
127
168
|
- test/controllers/app_definitions_controller_test.rb
|
128
169
|
- test/controllers/app_instances_controller_test.rb
|
129
170
|
- test/controllers/ui_acd_controller_test.rb
|
@@ -230,3 +271,4 @@ test_files:
|
|
230
271
|
- test/controllers/ui_acd_controller_test.rb
|
231
272
|
- test/controllers/app_definitions_controller_test.rb
|
232
273
|
- test/controllers/app_instances_controller_test.rb
|
274
|
+
- test/controllers/ansible_playbooks_controller_test.rb
|
@@ -1,19 +0,0 @@
|
|
1
|
-
<% title _("Deploy Application Instance #{@app_instance}") %>
|
2
|
-
|
3
|
-
<% content_for(:javascripts) do %>
|
4
|
-
<%= webpacked_plugins_js_for :foreman_acd %>
|
5
|
-
<% end %>
|
6
|
-
<% content_for(:stylesheets) do %>
|
7
|
-
<%= webpacked_plugins_css_for :foreman_acd %>
|
8
|
-
<% end %>
|
9
|
-
|
10
|
-
<%
|
11
|
-
json = {
|
12
|
-
"mode": 'liveReport',
|
13
|
-
"hosts": @deploy_hosts
|
14
|
-
}
|
15
|
-
%>
|
16
|
-
|
17
|
-
<div id='deploy'></div>
|
18
|
-
<%= mount_react_component('ApplicationInstanceReport', "#deploy", json.to_json) %>
|
19
|
-
</div
|