Skip to content

Commit

Permalink
Merge pull request ansible-community#32 from erinn/systemd_option
Browse files Browse the repository at this point in the history
Support podman's systemd option.
  • Loading branch information
sshnaidm authored Feb 25, 2021
2 parents 7de8ae7 + daea1e0 commit d0092db
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/molecule_podman/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class Podman(Driver):
cgroup_manager: cgroupfs
storage_opt: overlay.mount_program=/usr/bin/fuse-overlayfs
storage_driver: overlay
systemd: true|false|always
If specifying the `CMD`_ directive in your ``Dockerfile.j2`` or consuming a
built image which declares a ``CMD`` directive, then you must set
Expand Down
1 change: 1 addition & 0 deletions lib/molecule_podman/playbooks/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
{% if item.cgroup_manager is defined %}--cgroup-manager={{ item.cgroup_manager }}{% endif %}
{% if item.storage_opt is defined %}--storage-opt={{ item.storage_opt }}{% endif %}
{% if item.storage_driver is defined %}--storage-driver={{ item.storage_driver }}{% endif %}
{% if item.systemd is defined %}--systemd={{ item.systemd }}{% endif %}
{{ item.pre_build_image | default(false) | ternary('', 'molecule_local/') }}{{ item.image }}
{{ (command_directives_dict | default({}))[item.name] | default('') }}
register: server
Expand Down

0 comments on commit d0092db

Please sign in to comment.