From 4b96222991285d4317d182b03d44a1b6f418a60d Mon Sep 17 00:00:00 2001 From: Brett Meehan Date: Mon, 6 Jan 2020 15:14:31 +1100 Subject: [PATCH] ITOPSENG-359 fix jira base_url on clone and add contextpath to both confluence and jira --- roles/confluence_config/tasks/main.yml | 2 +- roles/jira_config/tasks/main.yml | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml index e086d09..b777d7a 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/roles/confluence_config/tasks/main.yml @@ -108,7 +108,7 @@ where bandanacontext = '_GLOBAL' and bandanakey = 'atlassian.confluence.settings'; positional_args: - ".*" - - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}" + - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}" when: - atl_proxy_name is defined - atl_tomcat_scheme is defined diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml index cfa0bb6..28c8042 100644 --- a/roles/jira_config/tasks/main.yml +++ b/roles/jira_config/tasks/main.yml @@ -87,3 +87,19 @@ - "{{ atl_product_installation_versioned }}/temp" - "{{ atl_product_installation_versioned }}/work" changed_when: false # For Molecule idempotence check + +- name: Assert baseurl to same as atl_proxy_name + postgresql_query: + login_host: "{{ atl_db_host }}" + login_user: "{{ atl_jdbc_user }}" + login_password: "{{ atl_jdbc_password }}" + db: "{{ atl_jdbc_db_name }}" + query: > + update propertystring set propertyvalue=%s + where id=(select id from propertyentry where property_key = 'jira.baseurl') + positional_args: + - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}" + when: + - atl_proxy_name is defined + - atl_tomcat_scheme is defined + ignore_errors: yes # For Molecule as it has no db test framework included