Merge pull request #225 from Tompage1994/fix-controller-224

Fix credential for project

Author: sean-m-sullivan

.github/playbooks/configs/projects.yml

@@ -19,4 +19,11 @@ controller_projects:
     scm_url: https://github.com/ansible/ansible-examples.git
     description: ansible-examples
     organization: Satellite
+  - name: Test Inventory source project with credential
+    scm_type: git
+    scm_url: https://github.com/ansible/ansible-examples.git
+    description: ansible-examples
+    organization: Satellite
+    credential: gitlab-personal-access-token for satqe_auto_droid
+    wait: false
 ...

changelogs/fragments/bug-224.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fixed issue where `credential` was not working for project and instead the old `scm_credential` option remained.

roles/projects/tasks/main.yml

@@ -10,7 +10,7 @@
     local_path:                           "{{ __controller_project_item.local_path | default(omit, true) }}"
     scm_branch:                           "{{ __controller_project_item.scm_branch | default(omit, true)  }}"
     scm_refspec:                          "{{ __controller_project_item.scm_refspec | default(omit, true) }}"
-    credential:                           "{{ __controller_project_item.scm_credential | default(__controller_project_item.credential.name | default(omit, true)) }}"
+    credential:                           "{{ __controller_project_item.credential.name | default(__controller_project_item.credential | default(__controller_project_item.scm_credential | default(omit, true))) }}"
     scm_clean:                            "{{ __controller_project_item.scm_clean | default(omit) }}"
     scm_delete_on_update:                 "{{ __controller_project_item.scm_delete_on_update | default(omit) }}"
     scm_track_submodules:                 "{{ __controller_project_item.scm_track_submodules | default(omit) }}"