foreman_ansible 7.0.3 → 7.0.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/foreman_ansible/remote_execution.rb +0 -6
- data/lib/foreman_ansible/version.rb +1 -1
- metadata +31 -33
- data/app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb +0 -37
- data/webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js.orig +0 -151
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6974b31e097d2cb11b28ed665e3346b9b6b2b08111cc3a7701c062aeb41c6e09
|
4
|
+
data.tar.gz: 13d80c394e6e050d0b9009e86ce1a8b0f500e65c678e6d7b8596b286ae70489a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: df9ff9f909efd6602b11ac585fe8b3768b3168a869232038d4c92a5b1d2acdf635a9ce0834bfff2385aed1475e63c8361894b06b297eb38ec41adbccf8ea67ba
|
7
|
+
data.tar.gz: 68dc31b736c3ff6b787bf49fb4d24b1563b042d9845b8e8e122cfc87f50b8db97981add7b8b3ba06f91792c04460ccc0a08c6fc0193cc36fe5daaf6bba0e6e80
|
@@ -48,12 +48,6 @@ module ForemanAnsible
|
|
48
48
|
:description => N_('Upgrade Capsules on given Capsule server hosts'),
|
49
49
|
:proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
|
50
50
|
)
|
51
|
-
RemoteExecutionFeature.register(
|
52
|
-
:ansible_configure_cloud_connector,
|
53
|
-
N_('Configure Cloud Connector on given hosts'),
|
54
|
-
:description => N_('Configure Cloud Connector on given hosts'),
|
55
|
-
:proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
|
56
|
-
)
|
57
51
|
end
|
58
52
|
end
|
59
53
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: foreman_ansible
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.0.
|
4
|
+
version: 7.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Daniel Lobato Garcia
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-04-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: acts_as_list
|
@@ -179,7 +179,6 @@ files:
|
|
179
179
|
- app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb
|
180
180
|
- app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.erb
|
181
181
|
- app/views/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb
|
182
|
-
- app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb
|
183
182
|
- app/views/foreman_ansible/job_templates/convert_to_rhel.erb
|
184
183
|
- app/views/foreman_ansible/job_templates/maintenance_plan.erb
|
185
184
|
- app/views/foreman_ansible/job_templates/module_action_-_ansible_default.erb
|
@@ -327,7 +326,6 @@ files:
|
|
327
326
|
- webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.js
|
328
327
|
- webpack/components/AnsibleHostDetail/components/JobsTab/NewRecurringJobModal.scss
|
329
328
|
- webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js
|
330
|
-
- webpack/components/AnsibleHostDetail/components/JobsTab/PreviousJobsTable.js.orig
|
331
329
|
- webpack/components/AnsibleHostDetail/components/JobsTab/RecurringJobsTable.js
|
332
330
|
- webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.fixtures.js
|
333
331
|
- webpack/components/AnsibleHostDetail/components/JobsTab/__test__/JobsTab.test.js
|
@@ -449,50 +447,50 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
449
447
|
- !ruby/object:Gem::Version
|
450
448
|
version: '0'
|
451
449
|
requirements: []
|
452
|
-
rubygems_version: 3.
|
450
|
+
rubygems_version: 3.1.4
|
453
451
|
signing_key:
|
454
452
|
specification_version: 4
|
455
453
|
summary: Ansible integration with Foreman (theforeman.org)
|
456
454
|
test_files:
|
457
|
-
- test/
|
455
|
+
- test/factories/ansible_proxy.rb
|
456
|
+
- test/factories/ansible_roles.rb
|
457
|
+
- test/factories/ansible_variables.rb
|
458
|
+
- test/factories/host_ansible_enhancements.rb
|
459
|
+
- test/fixtures/insights_playbook.yaml
|
460
|
+
- test/fixtures/sample_facts.json
|
461
|
+
- test/fixtures/report.json
|
462
|
+
- test/functional/ansible_roles_controller_test.rb
|
463
|
+
- test/functional/api/v2/ansible_inventories_controller_test.rb
|
458
464
|
- test/functional/api/v2/ansible_roles_controller_test.rb
|
459
|
-
- test/functional/api/v2/hostgroups_controller_test.rb
|
460
465
|
- test/functional/api/v2/ansible_variables_controller_test.rb
|
461
|
-
- test/functional/api/v2/
|
462
|
-
- test/functional/hosts_controller_test.rb
|
463
|
-
- test/functional/ansible_roles_controller_test.rb
|
464
|
-
- test/functional/ansible_variables_controller_test.rb
|
466
|
+
- test/functional/api/v2/hostgroups_controller_test.rb
|
467
|
+
- test/functional/api/v2/hosts_controller_test.rb
|
465
468
|
- test/functional/ui_ansible_roles_controller_test.rb
|
466
|
-
- test/
|
469
|
+
- test/functional/ansible_variables_controller_test.rb
|
470
|
+
- test/functional/hosts_controller_test.rb
|
471
|
+
- test/test_plugin_helper.rb
|
472
|
+
- test/unit/actions/run_ansible_job_test.rb
|
473
|
+
- test/unit/actions/run_proxy_ansible_command_test.rb
|
474
|
+
- test/unit/ansible_role_test.rb
|
475
|
+
- test/unit/concerns/config_reports_extensions_test.rb
|
476
|
+
- test/unit/concerns/host_managed_extensions_test.rb
|
477
|
+
- test/unit/concerns/hostgroup_extensions_test.rb
|
478
|
+
- test/unit/helpers/ansible_reports_helper_test.rb
|
479
|
+
- test/unit/lib/proxy_api/ansible_test.rb
|
467
480
|
- test/unit/services/ansible_report_importer_test.rb
|
468
|
-
- test/unit/services/
|
481
|
+
- test/unit/services/insights_plan_runner_test.rb
|
469
482
|
- test/unit/services/roles_importer_test.rb
|
470
483
|
- test/unit/services/ansible_variables_importer_test.rb
|
471
|
-
- test/unit/services/override_resolver_test.rb
|
472
484
|
- test/unit/services/api_roles_importer_test.rb
|
473
|
-
- test/unit/services/
|
474
|
-
- test/unit/
|
485
|
+
- test/unit/services/inventory_creator_test.rb
|
486
|
+
- test/unit/services/override_resolver_test.rb
|
487
|
+
- test/unit/services/ui_roles_importer_test.rb
|
488
|
+
- test/unit/ansible_provider_test.rb
|
489
|
+
- test/unit/ansible_variable_test.rb
|
475
490
|
- test/unit/host_ansible_role_test.rb
|
476
491
|
- test/unit/hostgroup_ansible_role_test.rb
|
477
|
-
- test/unit/helpers/ansible_reports_helper_test.rb
|
478
|
-
- test/unit/ansible_provider_test.rb
|
479
|
-
- test/unit/concerns/host_managed_extensions_test.rb
|
480
|
-
- test/unit/concerns/config_reports_extensions_test.rb
|
481
|
-
- test/unit/concerns/hostgroup_extensions_test.rb
|
482
492
|
- test/unit/ignore_roles_test.rb
|
483
|
-
- test/unit/ansible_variable_test.rb
|
484
493
|
- test/unit/import_roles_and_variables.rb
|
485
|
-
- test/unit/lib/proxy_api/ansible_test.rb
|
486
|
-
- test/unit/actions/run_ansible_job_test.rb
|
487
|
-
- test/unit/actions/run_proxy_ansible_command_test.rb
|
488
494
|
- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
|
489
|
-
- test/test_plugin_helper.rb
|
490
|
-
- test/factories/ansible_proxy.rb
|
491
|
-
- test/factories/ansible_variables.rb
|
492
|
-
- test/factories/host_ansible_enhancements.rb
|
493
|
-
- test/factories/ansible_roles.rb
|
494
|
-
- test/fixtures/report.json
|
495
|
-
- test/fixtures/sample_facts.json
|
496
|
-
- test/fixtures/insights_playbook.yaml
|
497
495
|
- test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
|
498
496
|
- test/graphql/queries/ansible_roles_query_test.rb
|
data/app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb
DELETED
@@ -1,37 +0,0 @@
|
|
1
|
-
<%#
|
2
|
-
name: Configure Cloud Connector
|
3
|
-
snippet: false
|
4
|
-
template_inputs:
|
5
|
-
- name: satellite_user
|
6
|
-
required: true
|
7
|
-
input_type: user
|
8
|
-
advanced: false
|
9
|
-
value_type: plain
|
10
|
-
hidden_value: false
|
11
|
-
- name: satellite_password
|
12
|
-
required: true
|
13
|
-
input_type: user
|
14
|
-
advanced: false
|
15
|
-
value_type: plain
|
16
|
-
hidden_value: true
|
17
|
-
- name: http_proxy
|
18
|
-
required: false
|
19
|
-
input_type: user
|
20
|
-
advanced: true
|
21
|
-
value_type: plain
|
22
|
-
hidden_value: false
|
23
|
-
description: You can specify a HTTP proxy address that should be used for Cloud Connector connection to the cloud.redhat.com. Note that it must be HTTP proxy, not HTTPS. The tunelling of SSL (secured web socket connection) in SSL (HTTPS proxy) is currently unsupported.
|
24
|
-
model: JobTemplate
|
25
|
-
job_category: Maintenance Operations
|
26
|
-
description_format: "%{template_name}"
|
27
|
-
provider_type: Ansible
|
28
|
-
kind: job_template
|
29
|
-
feature: ansible_configure_cloud_connector
|
30
|
-
%>
|
31
|
-
|
32
|
-
---
|
33
|
-
- hosts: all
|
34
|
-
vars:
|
35
|
-
satellite_url: "<%= foreman_server_url %>"
|
36
|
-
roles:
|
37
|
-
- project-receptor.satellite_receptor_installer
|
@@ -1,151 +0,0 @@
|
|
1
|
-
import React from 'react';
|
2
|
-
import PropTypes from 'prop-types';
|
3
|
-
import { translate as __ } from 'foremanReact/common/I18n';
|
4
|
-
import { usePaginationOptions } from 'foremanReact/components/Pagination/PaginationHooks';
|
5
|
-
|
6
|
-
import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
|
7
|
-
|
8
|
-
import {
|
9
|
-
TableComposable,
|
10
|
-
Thead,
|
11
|
-
Tbody,
|
12
|
-
Tr,
|
13
|
-
Th,
|
14
|
-
Td,
|
15
|
-
} from '@patternfly/react-table';
|
16
|
-
import { Flex, FlexItem, Pagination } from '@patternfly/react-core';
|
17
|
-
|
18
|
-
import { decodeId } from '../../../../globalIdHelper';
|
19
|
-
import withLoading from '../../../withLoading';
|
20
|
-
<<<<<<< HEAD
|
21
|
-
import { readableCron } from './JobsTabHelper';
|
22
|
-
import {
|
23
|
-
preparePerPageOptions,
|
24
|
-
refreshPage,
|
25
|
-
} from '../../../../helpers/paginationHelper';
|
26
|
-
=======
|
27
|
-
import { readableCron, readablePurpose } from './JobsTabHelper';
|
28
|
-
>>>>>>> 5b01704 (Fixes #34458 - Show Hostgroup jobs on the Host Detail page)
|
29
|
-
|
30
|
-
const PreviousJobsTable = ({ history, totalCount, jobs, pagination }) => {
|
31
|
-
const columns = [
|
32
|
-
__('Description'),
|
33
|
-
__('Result'),
|
34
|
-
__('State'),
|
35
|
-
__('Executed at'),
|
36
|
-
__('Schedule'),
|
37
|
-
];
|
38
|
-
|
39
|
-
const handlePerPageSelected = (event, perPage) => {
|
40
|
-
refreshPage(history, { page: 1, perPage });
|
41
|
-
};
|
42
|
-
|
43
|
-
const handlePageSelected = (event, page) => {
|
44
|
-
refreshPage(history, { ...pagination, page });
|
45
|
-
};
|
46
|
-
|
47
|
-
const perPageOptions = preparePerPageOptions(usePaginationOptions());
|
48
|
-
|
49
|
-
return (
|
50
|
-
<React.Fragment>
|
51
|
-
<h3>{__('Previously executed jobs')}</h3>
|
52
|
-
<<<<<<< HEAD
|
53
|
-
<Flex className="pf-u-pt-md">
|
54
|
-
=======
|
55
|
-
<Flex direction={{ default: 'column' }} className="pf-u-pt-md">
|
56
|
-
<FlexItem align={{ default: 'alignRight' }}>
|
57
|
-
<Pagination updateParamsByUrl itemCount={totalCount} variant="top" />
|
58
|
-
</FlexItem>
|
59
|
-
<FlexItem>
|
60
|
-
<TableComposable variant="compact">
|
61
|
-
<Thead>
|
62
|
-
<Tr>
|
63
|
-
{columns.map(col => (
|
64
|
-
<Th key={col}>{col}</Th>
|
65
|
-
))}
|
66
|
-
</Tr>
|
67
|
-
</Thead>
|
68
|
-
<Tbody>
|
69
|
-
{jobs.map(job => (
|
70
|
-
<Tr key={job.id}>
|
71
|
-
<Td>
|
72
|
-
<a
|
73
|
-
onClick={() =>
|
74
|
-
window.tfm.nav.pushUrl(
|
75
|
-
`/job_invocations/${decodeId(job.id)}`
|
76
|
-
)
|
77
|
-
}
|
78
|
-
>
|
79
|
-
{job.description}
|
80
|
-
</a>
|
81
|
-
|
82
|
-
{readablePurpose(job.recurringLogic.purpose)}
|
83
|
-
</Td>
|
84
|
-
<Td>{job.task.result}</Td>
|
85
|
-
<Td>{job.task.state}</Td>
|
86
|
-
<Td>
|
87
|
-
<RelativeDateTime date={job.startAt} />
|
88
|
-
</Td>
|
89
|
-
<Td>{readableCron(job.recurringLogic.cronLine)}</Td>
|
90
|
-
</Tr>
|
91
|
-
))}
|
92
|
-
</Tbody>
|
93
|
-
</TableComposable>
|
94
|
-
</FlexItem>
|
95
|
-
>>>>>>> 5b01704 (Fixes #34458 - Show Hostgroup jobs on the Host Detail page)
|
96
|
-
<FlexItem align={{ default: 'alignRight' }}>
|
97
|
-
<Pagination
|
98
|
-
itemCount={totalCount}
|
99
|
-
page={pagination.page}
|
100
|
-
perPage={pagination.perPage}
|
101
|
-
onSetPage={handlePageSelected}
|
102
|
-
onPerPageSelect={handlePerPageSelected}
|
103
|
-
perPageOptions={perPageOptions}
|
104
|
-
variant="top"
|
105
|
-
/>
|
106
|
-
</FlexItem>
|
107
|
-
</Flex>
|
108
|
-
<TableComposable variant="compact">
|
109
|
-
<Thead>
|
110
|
-
<Tr>
|
111
|
-
{columns.map(col => (
|
112
|
-
<Th key={col}>{col}</Th>
|
113
|
-
))}
|
114
|
-
</Tr>
|
115
|
-
</Thead>
|
116
|
-
<Tbody>
|
117
|
-
{jobs.map(job => (
|
118
|
-
<Tr key={job.id}>
|
119
|
-
<Td>
|
120
|
-
<a
|
121
|
-
onClick={() =>
|
122
|
-
window.tfm.nav.pushUrl(
|
123
|
-
`/job_invocations/${decodeId(job.id)}`
|
124
|
-
)
|
125
|
-
}
|
126
|
-
>
|
127
|
-
{job.description}
|
128
|
-
</a>
|
129
|
-
</Td>
|
130
|
-
<Td>{job.task.result}</Td>
|
131
|
-
<Td>{job.task.state}</Td>
|
132
|
-
<Td>
|
133
|
-
<RelativeDateTime date={job.startAt} />
|
134
|
-
</Td>
|
135
|
-
<Td>{readableCron(job.recurringLogic.cronLine)}</Td>
|
136
|
-
</Tr>
|
137
|
-
))}
|
138
|
-
</Tbody>
|
139
|
-
</TableComposable>
|
140
|
-
</React.Fragment>
|
141
|
-
);
|
142
|
-
};
|
143
|
-
|
144
|
-
PreviousJobsTable.propTypes = {
|
145
|
-
jobs: PropTypes.array.isRequired,
|
146
|
-
history: PropTypes.object.isRequired,
|
147
|
-
totalCount: PropTypes.number.isRequired,
|
148
|
-
pagination: PropTypes.object.isRequired,
|
149
|
-
};
|
150
|
-
|
151
|
-
export default withLoading(PreviousJobsTable);
|