cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Properly detect credentials for tower_project

Browse source 
It seemed like it was mostly the wrong variables been looked at, making
it so a git repository could not be created without a credential.
This commit is contained in:
David Moreau Simard 2018-07-24 11:18:50 -04:00 committed by Brian Coca
parent 0461620b2d
commit 934500fb05
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/web_infrastructure/ansible_tower/tower_project.py
View file

@ -147,18 +147,18 @@ def main():
except (exc.NotFound) as excinfo: except (exc.NotFound) as excinfo:
module.fail_json(msg='Failed to update project, organization not found: {0}'.format(organization), changed=False) module.fail_json(msg='Failed to update project, organization not found: {0}'.format(organization), changed=False)
if scm_type: if scm_credential:
try: try:
cred_res = tower_cli.get_resource('credential') cred_res = tower_cli.get_resource('credential')
cred = cred_res.get(name=scm_credential) cred = cred_res.get(name=scm_credential)
scm_credential = cred['id']
except (exc.NotFound) as excinfo: except (exc.NotFound) as excinfo:
module.fail_json(msg='Failed to update project, credential not found: {0}'.format(scm_credential), changed=False) module.fail_json(msg='Failed to update project, credential not found: {0}'.format(scm_credential), changed=False)
credential = cred['id'] if scm_type else None
result = project.modify(name=name, description=description, result = project.modify(name=name, description=description,
organization=org['id'], organization=org['id'],
scm_type=scm_type, scm_url=scm_url, local_path=local_path, scm_type=scm_type, scm_url=scm_url, local_path=local_path,
scm_branch=scm_branch, scm_clean=scm_clean, credential=credential, scm_branch=scm_branch, scm_clean=scm_clean, credential=scm_credential,
scm_delete_on_update=scm_delete_on_update, scm_delete_on_update=scm_delete_on_update,
scm_update_on_launch=scm_update_on_launch, scm_update_on_launch=scm_update_on_launch,
create_on_missing=True) create_on_missing=True)

7
test/integration/targets/tower_project/tasks/main.yml
View file

@ -40,3 +40,10 @@
- assert: - assert:
that: that:
- "result is changed" - "result is changed"
- name: Create a git project without credentials
tower_project:
name: git project
organization: Default
scm_type: git
scm_url: https://github.com/ansible/ansible