From 581b4f6de6eb633ec9df3615629f86df3120fa47 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <toshio@fedoraproject.org>
Date: Fri, 18 Dec 2015 16:33:48 -0800
Subject: [PATCH] Add version_added to documentation
---
cloud/docker/docker.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/cloud/docker/docker.py b/cloud/docker/docker.py
index a7f924ae289..0902aaf92b7 100644
--- a/cloud/docker/docker.py
+++ b/cloud/docker/docker.py
@@ -100,6 +100,7 @@ options:
- List of host devices to expose to container
default: null
required: false
+ version_added: "2.1"
log_driver:
description:
- You can specify a different logging driver for the container than for the daemon.
@@ -391,7 +392,7 @@ EXAMPLES = '''
# stopped and removed, and a new one will be launched in its place.
# - link this container to the existing redis container launched above with
# an alias.
-# - grant the container read write permissions for the host's /dev/sda device
+# - grant the container read write permissions for the host's /dev/sda device
# through a node named /dev/xvda
# - bind TCP port 9000 within the container to port 8080 on all interfaces
# on the host.
@@ -849,8 +850,8 @@ class DockerManager(object):
}
optionals = {}
- for optional_param in ('devices', 'dns', 'volumes_from',
- 'restart_policy', 'restart_policy_retry', 'pid', 'extra_hosts',
+ for optional_param in ('devices', 'dns', 'volumes_from',
+ 'restart_policy', 'restart_policy_retry', 'pid', 'extra_hosts',
'log_driver', 'cap_add', 'cap_drop', 'read_only', 'log_opt'):
optionals[optional_param] = self.module.params.get(optional_param)
@@ -1313,7 +1314,7 @@ class DockerManager(object):
differing.append(container)
continue
- # DEVICES
+ # DEVICES
expected_devices = set()
for device in (self.module.params.get('devices') or []):