From 9b1154f6e091fbf28235e05805bd10be96fb4824 Mon Sep 17 00:00:00 2001 From: Brett Meehan Date: Sun, 12 Jan 2020 21:41:09 +1100 Subject: [PATCH] ITOPSENG-372 fix baseurl logic for when db_created does not exist --- roles/confluence_config/tasks/main.yml | 2 +- roles/crowd_config/tasks/main.yml | 4 ++-- roles/jira_config/tasks/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml index c20a1dc..ff58aff 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/roles/confluence_config/tasks/main.yml @@ -112,5 +112,5 @@ when: - atl_proxy_name is defined - atl_tomcat_scheme is defined - - not db_created.changed + - db_created is undefined or not db_created.changed ignore_errors: yes # For Molecule as it has no db test framework included diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml index eaec021..ec3c9b9 100644 --- a/roles/crowd_config/tasks/main.yml +++ b/roles/crowd_config/tasks/main.yml @@ -105,7 +105,7 @@ when: - atl_proxy_name is defined - atl_tomcat_scheme is defined - - not db_created.changed + - db_created is undefined or not db_created.changed ignore_errors: yes # For Molecule as it has no db test framework included - name: Check that crowd.cfg.xml exists @@ -125,4 +125,4 @@ path: "{{ atl_product_home_shared }}/crowd.cfg.xml" xpath: "/application-configuration/properties/property[@name='hibernate.connection.url']" value: "{{ atl_jdbc_url }}?reWriteBatchedInserts=true" - when: crowd_cfg_stat_result.stat.exists \ No newline at end of file + when: crowd_cfg_stat_result.stat.exists diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml index de2d9d3..0555831 100644 --- a/roles/jira_config/tasks/main.yml +++ b/roles/jira_config/tasks/main.yml @@ -102,5 +102,5 @@ when: - atl_proxy_name is defined - atl_tomcat_scheme is defined - - not db_created.changed + - db_created is undefined or not db_created.changed ignore_errors: yes # For Molecule as it has no db test framework included