Skip to content

Commit

Permalink
Merge pull request #2615 from guerzon/enhancement1
Browse files Browse the repository at this point in the history
Add support for memory and kernel_memory module parameters

Reviewed-by: https://github.com/apps/ansible-zuul
  • Loading branch information
ansible-zuul[bot] committed Mar 27, 2020
2 parents 64ddc98 + 85b49a0 commit 01dc3f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions molecule/provisioner/ansible/playbooks/docker/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
hostname: "{{ item.hostname | default(item.name) }}"
image: "{{ item.pre_build_image | default(false) | ternary('', 'molecule_local/') }}{{ item.image }}"
pull: "{{ item.pull | default(omit) }}"
memory: "{{ item.memory | default(omit) }}"
state: started
recreate: false
log_driver: json-file
Expand Down
1 change: 1 addition & 0 deletions molecule/test/resources/playbooks/docker/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
hostname: "{{ item.hostname | default(item.name) }}"
image: "{{ item.pre_build_image | default(false) | ternary('', 'molecule_local/') }}{{ item.image }}"
pull: "{{ item.pull | default (omit) }}"
memory: "{{ item.memory | default(omit) }}"
state: started
recreate: false
log_driver: json-file
Expand Down

0 comments on commit 01dc3f7

Please sign in to comment.