From f539d33c5b181689fa3f7b9c01a234a709fa4b75 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 13:36:05 +1100 Subject: [PATCH] DCD-1190: Move BB-specific variables out of the group vars to a common role. --- group_vars/aws_node_local.yml | 7 ------- roles/bitbucket_common/defaults/main.yml | 5 +++++ roles/bitbucket_config/default/main.yaml | 1 - roles/bitbucket_config/defaults/main.yaml | 3 +++ roles/bitbucket_config/meta/main.yml | 4 ++++ roles/bitbucket_dataset_restore/defaults/main.yml | 3 +++ roles/bitbucket_dataset_restore/meta/main.yml | 4 ++++ 7 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 roles/bitbucket_common/defaults/main.yml delete mode 100644 roles/bitbucket_config/default/main.yaml create mode 100644 roles/bitbucket_config/defaults/main.yaml create mode 100644 roles/bitbucket_config/meta/main.yml create mode 100644 roles/bitbucket_dataset_restore/defaults/main.yml create mode 100644 roles/bitbucket_dataset_restore/meta/main.yml diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 9db7661..b331964 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -153,10 +153,3 @@ 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') }}" -atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" diff --git a/roles/bitbucket_common/defaults/main.yml b/roles/bitbucket_common/defaults/main.yml new file mode 100644 index 0000000..2dbd25b --- /dev/null +++ b/roles/bitbucket_common/defaults/main.yml @@ -0,0 +1,5 @@ +--- + +atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" +atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" + diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml deleted file mode 100644 index ed97d53..0000000 --- a/roles/bitbucket_config/default/main.yaml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml new file mode 100644 index 0000000..9790c09 --- /dev/null +++ b/roles/bitbucket_config/defaults/main.yaml @@ -0,0 +1,3 @@ +--- + +atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" diff --git a/roles/bitbucket_config/meta/main.yml b/roles/bitbucket_config/meta/main.yml new file mode 100644 index 0000000..ca5ee97 --- /dev/null +++ b/roles/bitbucket_config/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - bitbucket_common diff --git a/roles/bitbucket_dataset_restore/defaults/main.yml b/roles/bitbucket_dataset_restore/defaults/main.yml new file mode 100644 index 0000000..90d88ea --- /dev/null +++ b/roles/bitbucket_dataset_restore/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" diff --git a/roles/bitbucket_dataset_restore/meta/main.yml b/roles/bitbucket_dataset_restore/meta/main.yml new file mode 100644 index 0000000..ca5ee97 --- /dev/null +++ b/roles/bitbucket_dataset_restore/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - bitbucket_common