diff --git a/cloud/glance_image b/cloud/glance_image
index b6f015eb830..af95c7d6efe 100644
--- a/cloud/glance_image
+++ b/cloud/glance_image
@@ -32,12 +32,12 @@ options:
      description:
         - Password of login user
      required: true
-     default: yes
+     default: 'yes'
    login_tenant_name:
      description:
         - The tenant name of the login user
      required: true
-     default: yes
+     default: 'yes'
    auth_url:
      description:
         - The keystone url for authentication
@@ -87,7 +87,7 @@ options:
      description:
         - Wether the image can be accesed publically
      required: false
-     default: yes
+     default: 'yes'
    copy_from:
      description:
         - A url from where the image can be downloaded, mutually exculsive with file parameter
diff --git a/cloud/keystone_user b/cloud/keystone_user
index 79772a74a81..65b4a6604fa 100644
--- a/cloud/keystone_user
+++ b/cloud/keystone_user
@@ -19,7 +19,7 @@ options:
      description:
         - Password of login user
      required: false
-     default: yes
+     default: 'yes'
    token:
      description:
         - The token to be uses in case the password is not specified
diff --git a/cloud/nova_compute b/cloud/nova_compute
index 1a3b6cc42b7..d9afc53a362 100644
--- a/cloud/nova_compute
+++ b/cloud/nova_compute
@@ -38,12 +38,12 @@ options:
      description:
         - Password of login user
      required: true
-     default: True
+     default: 'yes'
    login_tenant_name:
      description:
         - The tenant name of the login user
      required: true
-     default: True
+     default: 'yes'
    auth_url:
      description:
         - The keystone url for authentication
diff --git a/cloud/nova_keypair b/cloud/nova_keypair
index 5660c3ddc45..6edce4da26c 100644
--- a/cloud/nova_keypair
+++ b/cloud/nova_keypair
@@ -38,12 +38,12 @@ options:
      description:
         - Password of login user
      required: true
-     default: True
+     default: 'yes'
    login_tenant_name:
      description:
         - The tenant name of the login user
      required: true
-     default: True
+     default: 'yes'
    auth_url:
      description:
         - The keystone url for authentication
diff --git a/cloud/quantum_floating_ip b/cloud/quantum_floating_ip
index 84a87a0044a..79d21d1915e 100644
--- a/cloud/quantum_floating_ip
+++ b/cloud/quantum_floating_ip
@@ -40,12 +40,12 @@ options:
      description:
         - Password of login user
      required: true
-     default: True
+     default: 'yes'
    login_tenant_name:
      description:
         - The tenant name of the login user
      required: true
-     default: True
+     default: 'yes'
    auth_url:
      description:
         - The keystone url for authentication
@@ -160,12 +160,12 @@ def _create_floating_ip(quantum, module, port_id, net_id):
     try:
         result = quantum.create_floatingip({'floatingip': kwargs})
     except Exception as e:
-        module.fail_json( msg = "There was an error in updating the floating ip address: %s" % e.message)
-    module.exit_json( changed = True, result = result, public_ip=result['floatingip']['floating_ip_address'] )
+        module.fail_json(msg = "There was an error in updating the floating ip address: %s" % e.message)
+    module.exit_json(changed = True, result = result, public_ip=result['floatingip']['floating_ip_address'] )
 
 def _get_net_id(quantum, module):
     kwargs = {
-            'name': module.params['network_name'],
+        'name': module.params['network_name'],
     }
     try:
         networks = quantum.list_networks(**kwargs)