From d531eb146da8266026c59f01c5b2f24af06cef3a Mon Sep 17 00:00:00 2001
From: John Barker <john@johnrbarker.com>
Date: Sat, 2 Apr 2016 12:13:46 +0100
Subject: [PATCH] Replace BOOLEANS with true/false

---
 lib/ansible/modules/cloud/linode/linode.py          | 2 +-
 lib/ansible/modules/cloud/openstack/os_router.py    | 3 +--
 lib/ansible/modules/network/ios/ios_template.py     | 6 +++---
 lib/ansible/modules/network/iosxr/iosxr_config.py   | 2 +-
 lib/ansible/modules/network/iosxr/iosxr_template.py | 4 ++--
 lib/ansible/modules/network/nxos/nxos_config.py     | 2 +-
 lib/ansible/modules/network/nxos/nxos_template.py   | 6 +++---
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/lib/ansible/modules/cloud/linode/linode.py b/lib/ansible/modules/cloud/linode/linode.py
index 9ebc770a47..36f78d126e 100644
--- a/lib/ansible/modules/cloud/linode/linode.py
+++ b/lib/ansible/modules/cloud/linode/linode.py
@@ -40,7 +40,7 @@ options:
   linode_id:
     description:
      - Unique ID of a linode server
-    aliases: lid
+    aliases: [ 'lid' ]
     default: null
     type: integer
   plan:
diff --git a/lib/ansible/modules/cloud/openstack/os_router.py b/lib/ansible/modules/cloud/openstack/os_router.py
index e3de749d68..ed606f8ea3 100644
--- a/lib/ansible/modules/cloud/openstack/os_router.py
+++ b/lib/ansible/modules/cloud/openstack/os_router.py
@@ -54,10 +54,9 @@ options:
    network:
      description:
         - Unique name or ID of the external gateway network.
-        - required I(interfaces) or I(enable_snat) are provided,
+        - required I(interfaces) or I(enable_snat) are provided.
      type: string
      required: false
-               false otherwise.
      default: None
    external_fixed_ips:
      description:
diff --git a/lib/ansible/modules/network/ios/ios_template.py b/lib/ansible/modules/network/ios/ios_template.py
index 4c7c39f10d..13a8fc00df 100644
--- a/lib/ansible/modules/network/ios/ios_template.py
+++ b/lib/ansible/modules/network/ios/ios_template.py
@@ -47,7 +47,7 @@ options:
         without first checking if already configured.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   include_defaults:
     description:
       - The module, by default, will collect the current device
@@ -58,7 +58,7 @@ options:
         does not support such a flag, this argument is silently ignored.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   backup:
     description:
       - When this argument is configured true, the module will backup
@@ -67,7 +67,7 @@ options:
         the root of the playbook directory.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   config:
     description:
       - The module, by default, will connect to the remote device and
diff --git a/lib/ansible/modules/network/iosxr/iosxr_config.py b/lib/ansible/modules/network/iosxr/iosxr_config.py
index d1474fc0c1..8dfe7863e4 100644
--- a/lib/ansible/modules/network/iosxr/iosxr_config.py
+++ b/lib/ansible/modules/network/iosxr/iosxr_config.py
@@ -93,7 +93,7 @@ options:
         without first checking if already configured.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   config:
     description:
       - The module, by default, will connect to the remote device and
diff --git a/lib/ansible/modules/network/iosxr/iosxr_template.py b/lib/ansible/modules/network/iosxr/iosxr_template.py
index 97b5086d2a..4dda5f6fa3 100644
--- a/lib/ansible/modules/network/iosxr/iosxr_template.py
+++ b/lib/ansible/modules/network/iosxr/iosxr_template.py
@@ -47,7 +47,7 @@ options:
         without first checking if already configured.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   backup:
     description:
       - When this argument is configured true, the module will backup
@@ -56,7 +56,7 @@ options:
         the root of the playbook directory.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   config:
     description:
       - The module, by default, will connect to the remote device and
diff --git a/lib/ansible/modules/network/nxos/nxos_config.py b/lib/ansible/modules/network/nxos/nxos_config.py
index ec578eaaa1..99e1a2fc5e 100644
--- a/lib/ansible/modules/network/nxos/nxos_config.py
+++ b/lib/ansible/modules/network/nxos/nxos_config.py
@@ -93,7 +93,7 @@ options:
         without first checking if already configured.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   config:
     description:
       - The module, by default, will connect to the remote device and
diff --git a/lib/ansible/modules/network/nxos/nxos_template.py b/lib/ansible/modules/network/nxos/nxos_template.py
index 5e90bf36ba..6e1ea860f5 100644
--- a/lib/ansible/modules/network/nxos/nxos_template.py
+++ b/lib/ansible/modules/network/nxos/nxos_template.py
@@ -46,7 +46,7 @@ options:
         without first checking if already configured.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   include_defaults:
     description:
       - The module, by default, will collect the current device
@@ -56,7 +56,7 @@ options:
         device settings.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   backup:
     description:
       - When this argument is configured true, the module will backup
@@ -65,7 +65,7 @@ options:
         the root of the playbook directory.
     required: false
     default: false
-    choices: BOOLEANS
+    choices: [ "true", "false" ]
   config:
     description:
       - The module, by default, will connect to the remote device and