zuul/zuul-operator
Code Issues Proposed changes

Fix role order so that pg config is created before the pg cr

Browse Source
This commit is contained in:
Tristan Cacqueray 2019-04-08 04:44:59 +00:00
parent 3900ec1bf3
commit 84495bfa92
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/create_config/tasks/main.yaml
View File

@ -119,7 +119,7 @@
set_fact: set_fact:
tenant_config_updated: >- tenant_config_updated: >-
{% if (scheduler_config is changed and {% if (scheduler_config is changed and
scheduler_config.diff and scheduler_config.diff|default(None) and
'main.yaml' in scheduler_config.diff[-1][1]) %}True 'main.yaml' in scheduler_config.diff[-1][1]) %}True
{% endif %} {% endif %}

2
ansible/roles/deploy_pg/tasks/main.yaml
View File

@ -123,5 +123,3 @@
pgo-backrest: 'false' pgo-backrest: 'false'
pgo-version: 3.5.2 pgo-version: 3.5.2
usersecretname: "{{ pg_cluster_name }}-zuul-secret" usersecretname: "{{ pg_cluster_name }}-zuul-secret"
- pause:

4
ansible/zuul.yaml
View File

@ -7,13 +7,13 @@
command: env command: env
- import_role: - import_role:
name: get_status name: get_status
- import_role:
name: create_config
- import_role: - import_role:
name: deploy_pg name: deploy_pg
when: (pg_cr_lookup|length==0) when: (pg_cr_lookup|length==0)
- import_role: - import_role:
name: deploy_zk name: deploy_zk
when: (zk_cr_lookup|length==0) when: (zk_cr_lookup|length==0)
- import_role:
name: create_config
- import_role: - import_role:
name: deploy name: deploy