Skip to content

Commit bec2c8d

Browse files
evgenibastelfreak
andauthored
Fixes #38963 - Add openbolt plugin support (#1052)
* Fixes #38963 - Add openbolt plugin support (cherry picked from commit fe47367) * Update theforeman/foreman for openbolt support --------- Co-authored-by: Tim Meusel <tim@bastelfreak.de>
1 parent a0f304c commit bec2c8d

File tree

11 files changed

+19
-3
lines changed

11 files changed

+19
-3
lines changed

Puppetfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod 'theforeman/puppetserver_foreman', '~> 4.3.0'
1111
mod 'theforeman/tftp', '~> 10.0.0'
1212
mod 'katello/candlepin', '~> 17.0.0'
1313
mod 'theforeman/pulpcore', '~> 13.3.0'
14-
mod 'theforeman/foreman', '~> 28.0.0'
14+
mod 'theforeman/foreman', '~> 28.1.0'
1515
mod 'theforeman/foreman_proxy', '~> 29.1.0'
1616
mod 'theforeman/puppet', '~> 22.0.1'
1717
mod 'katello/foreman_proxy_content', '~> 31.3.0'

Puppetfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ FORGE
7171
theforeman-dns (12.0.0)
7272
puppetlabs-concat (>= 4.1.0, < 10.0.0)
7373
puppetlabs-stdlib (>= 9.0.0, < 10.0.0)
74-
theforeman-foreman (28.0.0)
74+
theforeman-foreman (28.1.0)
7575
puppet-extlib (>= 3.0.0, < 8.0.0)
7676
puppet-redis (>= 5.0.0, < 13.0.0)
7777
puppet-systemd (>= 3.1.0, < 10.0.0)
@@ -131,7 +131,7 @@ DEPENDENCIES
131131
puppetlabs-vcsrepo (>= 5.2.0)
132132
theforeman-dhcp (~> 9.4.0)
133133
theforeman-dns (~> 12.0.0)
134-
theforeman-foreman (~> 28.0.0)
134+
theforeman-foreman (~> 28.1.0)
135135
theforeman-foreman_proxy (~> 29.1.0)
136136
theforeman-iop (~> 0.5.3)
137137
theforeman-pulpcore (~> 13.3.0)

config/foreman-answers.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ foreman::plugin::leapp: false
4848
foreman::plugin::monitoring: false
4949
foreman::plugin::netbox: false
5050
foreman::plugin::omaha: false
51+
foreman::plugin::openbolt: false
5152
foreman::plugin::openscap: false
5253
foreman::plugin::ovirt: false
5354
foreman::plugin::proxmox: false
@@ -78,6 +79,7 @@ foreman_proxy::plugin::dynflow: false
7879
foreman_proxy::plugin::hdm: false
7980
foreman_proxy::plugin::monitoring: false
8081
foreman_proxy::plugin::omaha: false
82+
foreman_proxy::plugin::openbolt: false
8183
foreman_proxy::plugin::openscap: false
8284
foreman_proxy::plugin::remote_execution::script: false
8385
foreman_proxy::plugin::salt: false

config/foreman-proxy-content-answers.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ foreman_proxy::plugin::dns::infoblox: false
3737
foreman_proxy::plugin::dns::powerdns: false
3838
foreman_proxy::plugin::dns::route53: false
3939
foreman_proxy::plugin::hdm: false
40+
foreman_proxy::plugin::openbolt: false
4041
foreman_proxy::plugin::openscap: false
4142
foreman_proxy::plugin::remote_execution::script: false
4243
foreman_proxy::plugin::salt: false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
answers['foreman_proxy::plugin::openbolt'] ||= false
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
answers['foreman::plugin::openbolt'] ||= false
2+
answers['foreman_proxy::plugin::openbolt'] ||= false

config/katello-answers.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ foreman::plugin::kubevirt: false
6363
foreman::plugin::leapp: false
6464
foreman::plugin::monitoring: false
6565
foreman::plugin::netbox: false
66+
foreman::plugin::openbolt: false
6667
foreman::plugin::openscap: false
6768
foreman::plugin::ovirt: false
6869
foreman::plugin::proxmox: false
@@ -104,6 +105,7 @@ foreman_proxy::plugin::dns::powerdns: false
104105
foreman_proxy::plugin::dns::route53: false
105106
foreman_proxy::plugin::hdm: false
106107
foreman_proxy::plugin::monitoring: false
108+
foreman_proxy::plugin::openbolt: false
107109
foreman_proxy::plugin::openscap: false
108110
foreman_proxy::plugin::remote_execution::script: false
109111
foreman_proxy::plugin::salt: false
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
answers['foreman::plugin::openbolt'] ||= false
2+
answers['foreman_proxy::plugin::openbolt'] ||= false

spec/fixtures/pulpcore-migration-dont-use-content-plugins-on-upgrades/katello-answers-after.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ foreman::plugin::kubevirt: false
3131
foreman::plugin::leapp: false
3232
foreman::plugin::monitoring: false
3333
foreman::plugin::netbox: false
34+
foreman::plugin::openbolt: false
3435
foreman::plugin::ovirt: false
3536
foreman::plugin::proxmox: false
3637
foreman::plugin::puppet: false
@@ -52,6 +53,7 @@ foreman_proxy::plugin::dhcp::remote_isc: false
5253
foreman_proxy::plugin::discovery: false
5354
foreman_proxy::plugin::dns::powerdns: false
5455
foreman_proxy::plugin::dns::route53: false
56+
foreman_proxy::plugin::openbolt: false
5557
foreman_proxy::plugin::hdm: false
5658
foreman_proxy::plugin::monitoring: false
5759
foreman_proxy::plugin::salt: false

spec/fixtures/pulpcore-migration-rpm-only/katello-answers-after.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ foreman::plugin::kubevirt: false
3131
foreman::plugin::leapp: false
3232
foreman::plugin::monitoring: false
3333
foreman::plugin::netbox: false
34+
foreman::plugin::openbolt: false
3435
foreman::plugin::ovirt: false
3536
foreman::plugin::proxmox: false
3637
foreman::plugin::puppet: false
@@ -54,6 +55,7 @@ foreman_proxy::plugin::dns::powerdns: false
5455
foreman_proxy::plugin::dns::route53: false
5556
foreman_proxy::plugin::hdm: false
5657
foreman_proxy::plugin::monitoring: false
58+
foreman_proxy::plugin::openbolt: false
5759
foreman_proxy::plugin::salt: false
5860
foreman_proxy::plugin::shellhooks: false
5961
foreman_proxy_content:

0 commit comments

Comments
 (0)