Skip to content

Commit 412c370

Browse files
author
Alan Christie
committed
- Corrected graph and keycloak credential host name
- Project can now accommodate the scm_credential
1 parent 026f431 commit 412c370

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

tasks/add-credential-graph.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
description: "{{ item.description|default('', true) }}"
88
organization: "{{ tower.organisation }}"
99
inputs:
10-
hostname: "{{ item.host }}"
10+
hostname: "{{ item.hostname }}"
1111
password: "{{ item.password }}"
1212

1313
- name: Grant team access to the graph credential ({{ item.name }})

tasks/add-credential-keycloak.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
description: "{{ item.description|default('', true) }}"
88
organization: "{{ tower.organisation }}"
99
inputs:
10-
hostname: "{{ item.host }}"
10+
hostname: "{{ item.hostname }}"
1111
admin: "{{ item.admin }}"
1212
admin_password: "{{ item.admin_password }}"
1313
public_key: "{{ item.public_key }}"
@@ -26,3 +26,4 @@
2626
loop_control:
2727
loop_var: credential_team
2828
when: item.teams is defined
29+
:wq

tasks/add-project.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22

3-
- name: Add project ({{ item.name }})
3+
- name: Add project without credential ({{ item.name }})
44
awx.awx.tower_project:
55
name: "{{ item.name }}"
66
description: The {{ item.description }} Project
@@ -10,6 +10,20 @@
1010
scm_branch: "{{ item.scm_branch }}"
1111
scm_clean: yes
1212
scm_update_on_launch: yes
13+
when: item.scm_credential is not defined
14+
15+
- name: Add project with credential ({{ item.name }})
16+
awx.awx.tower_project:
17+
name: "{{ item.name }}"
18+
description: The {{ item.description }} Project
19+
organization: "{{ tower.organisation }}"
20+
scm_type: "{{ item.scm_type }}"
21+
scm_url: https://{{ item.scm_url }}.git
22+
scm_credential: "{{ item.scm_credential }}"
23+
scm_branch: "{{ item.scm_branch }}"
24+
scm_clean: yes
25+
scm_update_on_launch: yes
26+
when: item.scm_credential is defined
1327

1428
- name: Grant team access to the project ({{ item.name }})
1529
command: >-

0 commit comments

Comments
 (0)