diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b0f8b6ec..6cd14664 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -298,7 +298,7 @@ Bugfixes - Don't add newlines to secrets - Fix issue with podman and exposed ports - Fix signal diff for truncated and RT signal names -- Support empty stings in prefixes +- Support empty strings in prefixes - Update error message when pull set to false v1.8.1 diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 7b8d7d56..e9dde51c 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -429,7 +429,7 @@ releases: - Don't add newlines to secrets - Fix issue with podman and exposed ports - Fix signal diff for truncated and RT signal names - - Support empty stings in prefixes + - Support empty strings in prefixes - Update error message when pull set to false release_summary: Fixes for various modules release_date: '2021-11-09' diff --git a/docs/podman_container_info_module.html b/docs/podman_container_info_module.html index 806352e2..61441b8b 100644 --- a/docs/podman_container_info_module.html +++ b/docs/podman_container_info_module.html @@ -150,7 +150,7 @@

Return Values always -
Facts from all or specificed containers
+
Facts from all or specified containers

Sample:
[{'AppArmorProfile': '', 'Args': ['--single-child', '--', 'kolla_start'], 'BoundingCaps': ['CAP_CHOWN', 'CAP_DAC_OVERRIDE', 'CAP_FSETID', 'CAP_FOWNER', 'CAP_MKNOD', 'CAP_NET_RAW', 'CAP_SETGID', 'CAP_SETUID', 'CAP_SETFCAP', 'CAP_SETPCAP', 'CAP_NET_BIND_SERVICE', 'CAP_SYS_CHROOT', 'CAP_KILL', 'CAP_AUDIT_WRITE'], 'Config': {'Annotations': {'io.kubernetes.cri-o.ContainerType': 'sandbox', 'io.kubernetes.cri-o.TTY': 'false', 'io.podman.annotations.autoremove': 'FALSE', 'io.podman.annotations.init': 'FALSE', 'io.podman.annotations.privileged': 'FALSE', 'io.podman.annotations.publish-all': 'FALSE'}, 'AttachStderr': False, 'AttachStdin': False, 'AttachStdout': False, 'Cmd': ['kolla_start'], 'Domainname': '', 'Entrypoint': 'dumb-init --single-child --', 'Env': ['PATH=/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', 'TERM=xterm', 'HOSTNAME=', 'container=oci', 'KOLLA_INSTALL_METATYPE=rdo', 'KOLLA_BASE_DISTRO=centos', 'KOLLA_INSTALL_TYPE=binary', 'KOLLA_DISTRO_PYTHON_VERSION=2.7', 'KOLLA_BASE_ARCH=x86_64'], 'Hostname': 'c5c39e813703', 'Image': 'docker.io/tripleomaster/centos-haproxy:latest', 'Labels': {'build-date': '20190919', 'kolla_version': '8.1.0', 'name': 'haproxy', 'org.label-schema.build-date': '20190801', 'org.label-schema.license': 'GPLv2', 'org.label-schema.name': 'CentOS Base Image', 'org.label-schema.schema-version': '1.0', 'org.label-schema.vendor': 'CentOS'}, 'OnBuild': None, 'OpenStdin': False, 'StdinOnce': False, 'StopSignal': 15, 'Tty': False, 'User': '', 'Volumes': None, 'WorkingDir': '/'}, 'Created': '2019-10-01T12:51:00.233106443Z', 'Dependencies': [], 'Driver': 'overlay', 'EffectiveCaps': ['CAP_CHOWN', 'CAP_DAC_OVERRIDE', 'CAP_FSETID', 'CAP_FOWNER', 'CAP_MKNOD', 'CAP_NET_RAW', 'CAP_SETGID', 'CAP_SETUID', 'CAP_SETFCAP', 'CAP_SETPCAP', 'CAP_NET_BIND_SERVICE', 'CAP_SYS_CHROOT', 'CAP_KILL', 'CAP_AUDIT_WRITE'], 'ExecIDs': [], 'ExitCommand': ['/usr/bin/podman', '--root', '/var/lib/containers/storage', '--runroot', '/var/run/containers/storage', '--log-level', 'error', '--cgroup-manager', 'systemd', '--tmpdir', '/var/run/libpod', '--runtime', 'runc', '--storage-driver', 'overlay', '--events-backend', 'journald', 'container', 'cleanup', 'c9e813703f9b80a6ea2ad665aa9946435934e478a0c5322da835f3883872f'], 'GraphDriver': {'Name': 'overlay'}, 'HostConfig': {'AutoRemove': False, 'Binds': [], 'BlkioDeviceReadBps': None, 'BlkioDeviceReadIOps': None, 'BlkioDeviceWriteBps': None, 'BlkioDeviceWriteIOps': None, 'BlkioWeight': 0, 'BlkioWeightDevice': None, 'CapAdd': [], 'CapDrop': [], 'Cgroup': '', 'CgroupParent': '', 'ConsoleSize': [0, 0], 'ContainerIDFile': '', 'CpuCount': 0, 'CpuPercent': 0, 'CpuPeriod': 0, 'CpuQuota': 0, 'CpuRealtimePeriod': 0, 'CpuRealtimeRuntime': 0, 'CpuShares': 0, 'CpusetCpus': '', 'CpusetMems': '', 'Devices': [], 'DiskQuota': 0, 'Dns': [], 'DnsOptions': [], 'DnsSearch': [], 'ExtraHosts': [], 'GroupAdd': [], 'IOMaximumBandwidth': 0, 'IOMaximumIOps': 0, 'IpcMode': '', 'Isolation': '', 'KernelMemory': 0, 'Links': None, 'LogConfig': {'Config': None, 'Type': 'k8s-file'}, 'Memory': 0, 'MemoryReservation': 0, 'MemorySwap': 0, 'MemorySwappiness': -1, 'NanoCpus': 0, 'NetworkMode': 'default', 'OomKillDisable': False, 'OomScoreAdj': 0, 'PidMode': '', 'PidsLimit': 0, 'PortBindings': {}, 'Privileged': False, 'PublishAllPorts': False, 'ReadonlyRootfs': False, 'RestartPolicy': {'MaximumRetryCount': 0, 'Name': ''}, 'Runtime': 'oci', 'SecurityOpt': [], 'ShmSize': 65536000, 'Tmpfs': {}, 'UTSMode': '', 'Ulimits': [{'Hard': 1048576, 'Name': 'RLIMIT_NOFILE', 'Soft': 1048576}, {'Hard': 1048576, 'Name': 'RLIMIT_NPROC', 'Soft': 1048576}], 'UsernsMode': '', 'VolumeDriver': '', 'VolumesFrom': None}, 'HostnamePath': '', 'HostsPath': '', 'Id': 'c5c39f9b80a6ea2ad665aa9946435934e478a0c5322da835f3883872f', 'Image': '0e267acda67d0ebd643e900d820a91b961d859743039e620191ca1', 'ImageName': 'docker.io/tripleomaster/centos-haproxy:latest', 'IsInfra': False, 'MountLabel': 'system_u:object_r:svirt_sandbox_file_t:s0:c78,c866', 'Mounts': [], 'Name': 'haproxy', 'Namespace': '', 'NetworkSettings': {'Bridge': '', 'EndpointID': '', 'Gateway': '', 'GlobalIPv6Address': '', 'GlobalIPv6PrefixLen': 0, 'HairpinMode': False, 'IPAddress': '', 'IPPrefixLen': 0, 'IPv6Gateway': '', 'LinkLocalIPv6Address': '', 'LinkLocalIPv6PrefixLen': 0, 'MacAddress': '', 'Ports': [], 'SandboxID': '', 'SandboxKey': '', 'SecondaryIPAddresses': None, 'SecondaryIPv6Addresses': None}, 'OCIRuntime': 'runc', 'Path': 'dumb-init', 'Pod': '', 'ProcessLabel': 'system_u:system_r:svirt_lxc_net_t:s0:c785,c866', 'ResolvConfPath': '', 'RestartCount': 0, 'Rootfs': '', 'State': {'Dead': False, 'Error': '', 'ExitCode': 0, 'FinishedAt': '0001-01-01T00:00:00Z', 'Healthcheck': {'FailingStreak': 0, 'Log': None, 'Status': ''}, 'OOMKilled': False, 'OciVersion': '1.0.1-dev', 'Paused': False, 'Pid': 0, 'Restarting': False, 'Running': False, 'StartedAt': '0001-01-01T00:00:00Z', 'Status': 'configured'}}]
diff --git a/docs/podman_generate_systemd_module.html b/docs/podman_generate_systemd_module.html index 429be960..361952e1 100644 --- a/docs/podman_generate_systemd_module.html +++ b/docs/podman_generate_systemd_module.html @@ -390,7 +390,7 @@

Notes

ExamplesΒΆ

-
# Exemple of creating a container and integrate it into systemd
+
# Example of creating a container and integrate it into systemd
 - name: A postgres container must exist, stopped
   containers.podman.podman_container:
     name: postgres_local
@@ -411,7 +411,7 @@ 
Examples# Generate the unit files, but store them on an Ansible variable
-# instead of writting them on target host
+# instead of writing them on target host
 - name: Systemd unit files for postgres container must be generated
   containers.podman.podman_generate_systemd:
     name: postgres_local
diff --git a/plugins/modules/podman_container_exec.py b/plugins/modules/podman_container_exec.py
index 77662302..d30e85cd 100644
--- a/plugins/modules/podman_container_exec.py
+++ b/plugins/modules/podman_container_exec.py
@@ -72,7 +72,7 @@
     command: "cat redhat-release"
     workdir: /etc
 
-- name: Execute a command with a list of args and enviroment variables
+- name: Execute a command with a list of args and environment variables
   containers.podman.podman_container_exec:
     name: test_container
     argv:
diff --git a/plugins/modules/podman_container_info.py b/plugins/modules/podman_container_info.py
index bbdd29fb..dd361c44 100644
--- a/plugins/modules/podman_container_info.py
+++ b/plugins/modules/podman_container_info.py
@@ -50,7 +50,7 @@
 
 RETURN = r"""
 containers:
-    description: Facts from all or specificed containers
+    description: Facts from all or specified containers
     returned: always
     type: list
     elements: dict
diff --git a/plugins/modules/podman_generate_systemd.py b/plugins/modules/podman_generate_systemd.py
index 5f7474aa..486a18a8 100644
--- a/plugins/modules/podman_generate_systemd.py
+++ b/plugins/modules/podman_generate_systemd.py
@@ -394,7 +394,7 @@ def generate_systemd(module):
 
     # In case of error in running the command
     if return_code != 0:
-        # Print informations about the error and return and empty dictionary
+        # Print information about the error and return and empty dictionary
         message = 'Error generating systemd .service unit(s).'
         message += ' Command executed: {command_str}'
         message += ' Command returned with code: {return_code}.'
@@ -431,7 +431,7 @@ def generate_systemd(module):
                 changed = True
             # If destination exist but not a directory
             if not os.path.isdir(systemd_units_dest):
-                # Stop and tell user that the destination is not a directry
+                # Stop and tell user that the destination is not a directory
                 message = "Destination {systemd_units_dest} is not a directory."
                 message += " Can't save systemd unit files in."
                 module.fail_json(
diff --git a/plugins/modules/podman_image.py b/plugins/modules/podman_image.py
index 54aebc1f..ce159efd 100644
--- a/plugins/modules/podman_image.py
+++ b/plugins/modules/podman_image.py
@@ -17,7 +17,7 @@
   options:
     arch:
       description:
-        - CPU architecutre for the container image
+        - CPU architecture for the container image
       type: str
     name:
       description:
diff --git a/plugins/modules/podman_prune.py b/plugins/modules/podman_prune.py
index ee4c68a9..3fe3b753 100644
--- a/plugins/modules/podman_prune.py
+++ b/plugins/modules/podman_prune.py
@@ -66,17 +66,17 @@
         type: dict
     system:
         description:
-            - Wheter to prune unused pods, containers, image, networks and volume data
+            - Whether to prune unused pods, containers, image, networks and volume data
         type: bool
         default: false
     system_all:
         description:
-            - Wheter to prune all unused images, not only dangling images.
+            - Whether to prune all unused images, not only dangling images.
         type: bool
         default: false
     system_volumes:
         description:
-            - Wheter to prune volumes currently unused by any container.
+            - Whether to prune volumes currently unused by any container.
         type: bool
         default: false
     volume:
diff --git a/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml b/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml
index 091cd4c6..02387834 100644
--- a/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml
+++ b/tests/integration/targets/podman_container_idempotency/tasks/idem_all.yml
@@ -383,7 +383,7 @@
   assert:
     that: test29 is not changed
 
-- name: Remove dependant test container
+- name: Remove dependent test container
   containers.podman.podman_container:
     executable: "{{ test_executable | default('podman') }}"
     name: idempotency2
diff --git a/tests/integration/targets/podman_generate_systemd/tasks/main.yml b/tests/integration/targets/podman_generate_systemd/tasks/main.yml
index 0b12234d..1e48a11d 100644
--- a/tests/integration/targets/podman_generate_systemd/tasks/main.yml
+++ b/tests/integration/targets/podman_generate_systemd/tasks/main.yml
@@ -74,7 +74,7 @@
     checksum2: "{{ item.stat.checksum }}"
   with_items: "{{ unitfile2.results }}"
 
-- name: Check if the sytemd unit files are as expected
+- name: Check if the systemd unit files are as expected
   assert:
     that:
       - generate1 is not changed
diff --git a/tests/integration/targets/podman_image_info/tasks/main.yml b/tests/integration/targets/podman_image_info/tasks/main.yml
index 105ffcd1..adbd4947 100644
--- a/tests/integration/targets/podman_image_info/tasks/main.yml
+++ b/tests/integration/targets/podman_image_info/tasks/main.yml
@@ -39,7 +39,7 @@
       containers.podman.podman_image_info:
         executable: "{{ test_executable | default('podman') }}"
         name: nope
-      register: single_nonexistant
+      register: single_nonexistent
 
     - name: Get info on multiple images that do not exist
       containers.podman.podman_image_info:
@@ -47,7 +47,7 @@
         name:
           - nope
           - reallynope
-      register: multiple_nonexistant
+      register: multiple_nonexistent
 
     - name: Get info with one image that does not exist
       containers.podman.podman_image_info:
@@ -56,11 +56,11 @@
           - dnsmasq
           - nope
           - etcd
-      register: mixed_nonexistant
+      register: mixed_nonexistent
 
-    - name: Ensure image info was returned when non-existant image info was requisted
+    - name: Ensure image info was returned when non-existent image info was requisted
       assert:
         that:
-          - single_nonexistant.images | length == 0
-          - multiple_nonexistant.images | length == 0
-          - mixed_nonexistant.images | length == 2
+          - single_nonexistent.images | length == 0
+          - multiple_nonexistent.images | length == 0
+          - mixed_nonexistent.images | length == 2