From e2c08edfcc0559039ed49f7526287b39c3ce3311 Mon Sep 17 00:00:00 2001
From: Lee Shakespeare <lee@shakey.org>
Date: Wed, 17 May 2017 19:30:14 +0100
Subject: [PATCH] Tower user remove organization (#24544)

* Remove organization field from the tower_user module re: issue #24510

* Fix trailing spaces.

* Fixes for Shippable errors, pep8

* Remove a random inserted space.
---
 .../web_infrastructure/ansible_tower/tower_user.py    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/ansible/modules/web_infrastructure/ansible_tower/tower_user.py b/lib/ansible/modules/web_infrastructure/ansible_tower/tower_user.py
index fe04fde5ab6..3b86cd01728 100644
--- a/lib/ansible/modules/web_infrastructure/ansible_tower/tower_user.py
+++ b/lib/ansible/modules/web_infrastructure/ansible_tower/tower_user.py
@@ -54,11 +54,6 @@ options:
         - Password of the user.
       required: False
       default: null
-    organization:
-      description:
-        - Organization the user should be made a member of.
-      required: False
-      default: null
     superuser:
       description:
         - User is a system wide administator.
@@ -149,7 +144,6 @@ def main():
             last_name=dict(),
             password=dict(no_log=True),
             email=dict(required=True),
-            organization=dict(),
             superuser=dict(type='bool', default=False),
             auditor=dict(type='bool', default=False),
             tower_host=dict(),
@@ -170,7 +164,6 @@ def main():
     last_name = module.params.get('last_name')
     password = module.params.get('password')
     email = module.params.get('email')
-    organization = module.params.get('organization')
     superuser = module.params.get('superuser')
     auditor = module.params.get('auditor')
     state = module.params.get('state')
@@ -184,8 +177,8 @@ def main():
         try:
             if state == 'present':
                 result = user.modify(username=username, first_name=first_name, last_name=last_name,
-                                     email=email, password=password, organization=organization,
-                                     is_superuser=superuser, is_auditor=auditor, create_on_missing=True)
+                                     email=email, password=password, is_superuser=superuser,
+                                     is_auditor=auditor, create_on_missing=True)
                 json_output['id'] = result['id']
             elif state == 'absent':
                 result = user.delete(username=username)