diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index 3d8348e..c8eef56 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -8,10 +8,6 @@ atl_product_edition: "bitbucket" atl_product_user: "bitbucket" - atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}" - - atl_nfs_mountpoint: "{{ atl_shared_mountpoint }}/bitbucket/shared" - atl_nfs_target: "{{ atl_shared_mountpoint }}/bitbucket/shared" atl_nfs_version: "3" atl_startup_systemd_params: @@ -37,5 +33,3 @@ - role: product_startup - role: bitbucket_dataset_restore when: atl_bitbucket_dataset_url is search ("(http|https)://") - - diff --git a/roles/bitbucket_dataset_restore/tasks/main.yml b/roles/bitbucket_dataset_restore/tasks/main.yml index 0204079..2d6ef64 100644 --- a/roles/bitbucket_dataset_restore/tasks/main.yml +++ b/roles/bitbucket_dataset_restore/tasks/main.yml @@ -18,7 +18,7 @@ dest: "{{ atl_product_home_shared }}/data/migration/import" - name: Invoke Import API - uri: + uri: url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports" user: admin password: "{{ atl_bitbucket_admin_password }}" @@ -30,13 +30,13 @@ body_format: json return_content: yes register: output - until: output.status == 200 + until: output.status == 200 retries: 6 delay: 15 failed_when: output is defined and output.json is defined and output.json.state != 'INITIALISING' - name: get import status - uri: + uri: url: "{{ atl_bitbucket_baseurl }}/rest/api/1.0/migration/imports/{{ output.json.id }}" user: admin password: "{{ atl_bitbucket_admin_password }}" @@ -50,7 +50,7 @@ delay: 10 - name: create lock file - file: + file: path: "{{ atl_product_home_shared }}/data/migration/import/lock.file" state: touch when: import_status.json.state == 'COMPLETED'