Skip to content

Commit 10c0a28

Browse files
committed
(role/foreman) replace docker-ce with podman-docker
1 parent 7593140 commit 10c0a28

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

hieradata/role/foreman.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ classes:
33
- "profile::core::common"
44
- "profile::core::debugutils"
55
- "profile::core::dhcp"
6-
- "profile::core::docker"
7-
- "profile::core::docker::prune"
86
- "profile::core::foreman"
97
- "profile::core::foreman::fog_hack"
108

9+
packages:
10+
- "podman-docker"
11+
1112
dhcp::bootp: true
1213
dhcp::ddns_update_style: "none"
1314
dhcp::default_lease_time: &lease_time 86400
@@ -306,3 +307,6 @@ files:
306307
content: |
307308
:filters:
308309
- !ruby/regexp '/^(?!profile::)/'
310+
/etc/containers/nodocker:
311+
ensure: "file"
312+
mode: "0444"

spec/support/spec/foreman.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545

4646
shared_examples 'generic foreman' do
4747
include_examples 'debugutils'
48-
include_examples 'docker'
4948
include_examples 'fog_hack'
5049
include_examples 'foreman'
5150

@@ -256,4 +255,6 @@
256255
baseurl: "http://yum.puppet.com/puppet8/el/#{facts[:os]['release']['major']}/x86_64"
257256
)
258257
end
258+
259+
it { is_expected.to contain_package('podman-docker') }
259260
end

0 commit comments

Comments
 (0)