From c59d3525abcdba364530dbba8ab46c3cb81030d0 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 10:47:36 +1100 Subject: [PATCH] DCD-1190: Expect a space-delimited list of properties from the quickstart. --- roles/bitbucket_config/defaults/main.yaml | 3 ++- roles/bitbucket_config/molecule/default/playbook.yml | 2 ++ .../bitbucket_config/molecule/default/tests/test_default.py | 5 +++++ roles/bitbucket_config/templates/bitbucket.properties.j2 | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml index 9eccfb1..1ae8340 100644 --- a/roles/bitbucket_config/defaults/main.yaml +++ b/roles/bitbucket_config/defaults/main.yaml @@ -1,4 +1,5 @@ --- atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_properties: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" +atl_bitbucket_properties_raw: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" +atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject('equalto', '') | list }}" diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml index f9c424b..8a37408 100644 --- a/roles/bitbucket_config/molecule/default/playbook.yml +++ b/roles/bitbucket_config/molecule/default/playbook.yml @@ -12,6 +12,8 @@ atl_jdbc_user: 'bb_db_user' atl_jdbc_password: 'molecule_password' + atl_bitbucket_properties_raw: "key1=va1 key2=val2 key3=val3" + roles: - role: linux_common - role: product_common diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py index 00593ec..e1d0905 100644 --- a/roles/bitbucket_config/molecule/default/tests/test_default.py +++ b/roles/bitbucket_config/molecule/default/tests/test_default.py @@ -14,3 +14,8 @@ def test_config_file(host): assert f.contains("jdbc.driver=org.postgresql.Driver") assert f.contains("jdbc.user=bb_db_user") assert f.contains("jdbc.password=molecule_password") + + assert f.contains("key1=val1") + assert f.contains("key2=val2") + assert f.contains("key3=val3") + diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 5b8beca..3551c5b 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -34,6 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} -{% if atl_bitbucket_properties is defined %} -{{ atl_bitbucket_properties }} -{% endif %} +{% for prop in atl_bitbucket_properties %} +{{ prop }} +{% endfor %}