From 19a2af10ae379b66a368481da2db2121545b04f5 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 11 Feb 2020 15:16:38 -0800 Subject: [PATCH 1/6] add when condition to bitbucket_dataset_restore role --- aws_bitbucket_dc_node.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index e5c8240..23b7676 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -36,5 +36,6 @@ - role: bitbucket_config - role: product_startup - role: bitbucket_dataset_restore + when: atl_bitbucket_dataset_url is defined From 39dd1fa361806c65391c3793e7e9f5abc8057898 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 7 Apr 2020 22:29:28 -0700 Subject: [PATCH 2/6] changed role condition to check for length --- aws_bitbucket_dc_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 23b7676..4cc4d4e 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -36,6 +36,6 @@ - role: bitbucket_config - role: product_startup - role: bitbucket_dataset_restore - when: atl_bitbucket_dataset_url is defined + when: atl_bitbucket_dataset_url|length > 2 From 21c91fe234afb398daac723f9d08244db5881ea8 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 14 Apr 2020 15:30:06 -0700 Subject: [PATCH 3/6] add regex to validate dataset URL --- aws_bitbucket_dc_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 4cc4d4e..f158d65 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -36,6 +36,6 @@ - role: bitbucket_config - role: product_startup - role: bitbucket_dataset_restore - when: atl_bitbucket_dataset_url|length > 2 + when: atl_bitbucket_dataset_url is search ("(http|https|ftp)://[user[:pass]]@host.domain[:port]/path") From addb0b591f71fadd52679750099854dfded43685 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 14 Apr 2020 16:07:01 -0700 Subject: [PATCH 4/6] sub atl_bitbucket_baseurl with ATL_PROXY_NAME --- group_vars/aws_node_local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index bf6b6f6..06c73e3 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -147,4 +147,4 @@ atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" -atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" +atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_PROXY_NAME') }}" From f0f8db8e21ee07d36b4369152bc4ff746bbb4841 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 14 Apr 2020 16:11:00 -0700 Subject: [PATCH 5/6] modified regex path on ln 39 --- aws_bitbucket_dc_node.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index f158d65..3d8348e 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -36,6 +36,6 @@ - role: bitbucket_config - role: product_startup - role: bitbucket_dataset_restore - when: atl_bitbucket_dataset_url is search ("(http|https|ftp)://[user[:pass]]@host.domain[:port]/path") + when: atl_bitbucket_dataset_url is search ("(http|https)://") From bcdb3f58d8ac8df9c6fd59efdd7e4ae10c00ed10 Mon Sep 17 00:00:00 2001 From: Andy Rajagopalan Date: Tue, 14 Apr 2020 22:37:44 -0700 Subject: [PATCH 6/6] change aws_node_local.yml ln 150 --- group_vars/aws_node_local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 06c73e3..bf6b6f6 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -147,4 +147,4 @@ atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" -atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_PROXY_NAME') }}" +atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}"