From 1614afb98e6e2f6d84faea23d489019631fd39ad Mon Sep 17 00:00:00 2001
From: Andy Rajagopalan <ranandthirth@gmail.com>
Date: Thu, 31 Oct 2019 10:47:05 -0700
Subject: [PATCH] moved lines to the end - bb_license_key, bb_admin_password,
 bb_dataset_url

---
 group_vars/aws_node_local.yml                            | 6 ++++++
 roles/bitbucket_config/tasks/main.yml                    | 5 +++++
 roles/bitbucket_config/templates/bitbucket.properties.j2 | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index bb380b9..8a284a4 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -132,4 +132,10 @@ atl_rds_subnet_group_name: "{{ lookup('env', 'ATL_RDS_SUBNET_GROUP_NAME') }}"
 atl_rds_security_group: "{{ lookup('env', 'ATL_RDS_SECURITY_GROUP') }}"
 
 atl_backup_manifest_url: "{{ lookup('env', 'ATL_BACKUP_MANIFEST_URL') }}"
+
 atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_manifest_url != '' }}"
+
+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') }}"
+
diff --git a/roles/bitbucket_config/tasks/main.yml b/roles/bitbucket_config/tasks/main.yml
index 4857761..85e495e 100644
--- a/roles/bitbucket_config/tasks/main.yml
+++ b/roles/bitbucket_config/tasks/main.yml
@@ -23,3 +23,8 @@
     mode: "u=rwX,g=rX,o=rX"
     recurse: true
   changed_when: false  # For Molecule idempotence check
+
+  - name: Copy Bitbucket dataset from s3
+    get_url:
+      url: "{{ atl_bitbucket_dataset_url }}"
+      dest: /media/atl/bitbucket/shared/data/migration/import/
\ No newline at end of file
diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2
index 2ecece1..4862142 100644
--- a/roles/bitbucket_config/templates/bitbucket.properties.j2
+++ b/roles/bitbucket_config/templates/bitbucket.properties.j2
@@ -18,6 +18,9 @@ plugin.search.elasticsearch.baseurl={{ atl_elasticsearch_endpoint }}
 server.proxy-name={{ atl_proxy_name }}
 server.secure={{ atl_ssl_proxy }}
 server.require-ssl={{ atl_ssl_proxy }}
+setup.license={{ atl_bitbucket_license_key }}
+setup.sysadmin.username=admin
+setup.sysadmin.password={{ atl_bitbucket_admin_password }}
 {% if atl_ssl_proxy == 'true' %}
 server.scheme=https
 server.proxy-port=443