Do not require zuul_cluster label for provided sshsecretname
This commit is contained in:
parent
87b9158b3a
commit
5aa579c027
@ -6,7 +6,6 @@ tenants:
|
|||||||
- tenant:
|
- tenant:
|
||||||
name: demo
|
name: demo
|
||||||
source: {}
|
source: {}
|
||||||
sshsecretname: "{{ zuul_cluster_name }}-ssh-secret"
|
|
||||||
connections: []
|
connections: []
|
||||||
merger:
|
merger:
|
||||||
min: 0
|
min: 0
|
||||||
@ -22,6 +21,7 @@ state: "present"
|
|||||||
|
|
||||||
zuul_app_name: "zuul"
|
zuul_app_name: "zuul"
|
||||||
zuul_cluster_name: "{{ meta.name }}"
|
zuul_cluster_name: "{{ meta.name }}"
|
||||||
|
sshsecretname: "{{ zuul_cluster_name }}-ssh-secret"
|
||||||
|
|
||||||
zuul_version: "latest" #"3.7.1"
|
zuul_version: "latest" #"3.7.1"
|
||||||
# Use local image for https://review.openstack.org/650246
|
# Use local image for https://review.openstack.org/650246
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
- name: lookup cluster secret
|
- name: lookup cluster secret
|
||||||
set_fact:
|
set_fact:
|
||||||
zuul_pg_user: "{{ secrets_lookup | json_query(pg_user_query) }}"
|
zuul_pg_user: "{{ secrets_lookup | json_query(pg_user_query) }}"
|
||||||
zuul_ssh_key: "{{ secrets_lookup | json_query(ssh_key_query) }}"
|
zuul_ssh_key: "{{ lookup('k8s', api_version='v1', kind='Secret', namespace=namespace, resource_name=sshsecretname) }}"
|
||||||
|
|
||||||
- name: lookup k8s postgres cr
|
- name: lookup k8s postgres cr
|
||||||
set_fact:
|
set_fact:
|
||||||
|
@ -12,4 +12,7 @@ spec:
|
|||||||
web:
|
web:
|
||||||
min: 1
|
min: 1
|
||||||
connections: []
|
connections: []
|
||||||
tenants: []
|
tenants:
|
||||||
|
- tenant:
|
||||||
|
name: demo
|
||||||
|
source: {}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user