Merged in issue/inability-to-setup-self-menaged-synchrony-cluster (pull request #173)

Update atl_hazelcast_network_aws_tag_key to read environment var

Approved-by: Adam Brokes
Approved-by: Mykhailo Kratiuk

roles/confluence_config/defaults/main.yml

@@ -13,7 +13,7 @@ atl_db_validate: "{{ lookup('env', 'ATL_DB_VALIDATE') or 'false' }}"
 atl_db_acquireincrement: "{{ lookup('env', 'ATL_DB_ACQUIREINCREMENT') or '1' }}"
 atl_db_preferredtestquery: "{{ lookup('env', 'ATL_DB_PREFERREDTESTQUERY') or 'select version();' }}"
 
-atl_hazelcast_network_aws_tag_key: "Cluster"
+atl_hazelcast_network_aws_tag_key: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_TAG_KEY') or 'Cluster' }}"
 atl_hazelcast_network_aws_host_header: "ec2.amazonaws.com"
 atl_hazelcast_network_aws_iam_region: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_REGION') }}"
 atl_hazelcast_network_aws_iam_role: "{{ lookup('env', 'ATL_HAZELCAST_NETWORK_AWS_IAM_ROLE') }}"

roles/confluence_config/molecule/default/converge.yml

@@ -20,6 +20,7 @@
     atl_proxy_name: "localhost"
     atl_proxy_port: "80"
     atl_db_preferredtestquery: "select 1;"
+    atl_hazelcast_network_aws_tag_key: "my-cluster-tag"
 
   roles:
     - role: linux_common

roles/confluence_config/molecule/default/tests/test_default.py

@@ -80,6 +80,7 @@ def test_confluence_config_file(host):
     assert f.contains('<property name="hibernate.connection.password">molecule_password</property>')
     assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
     assert f.contains('<property name="confluence.webapp.context.path">/foo</property>')
+    assert f.contains('<property name="confluence.cluster.aws.tag.key">my-cluster-tag</property>')
 
 @pytest.mark.parametrize('font', [
 #    '/usr/lib/jvm/java/lib/fonts/fallback/NotoSansJavanese-Regular.ttf'