diff --git a/roles/bitbucket_config/molecule/default/converge.yml b/roles/bitbucket_config/molecule/default/converge.yml index 64dcf3f..a345492 100644 --- a/roles/bitbucket_config/molecule/default/converge.yml +++ b/roles/bitbucket_config/molecule/default/converge.yml @@ -17,6 +17,8 @@ atl_bitbucket_properties_raw: "key1=val1 key2=val2 key3=val3" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/bitbucket_config/molecule/iam_elasticsearch/converge.yml b/roles/bitbucket_config/molecule/iam_elasticsearch/converge.yml index 596fbfc..15914ea 100644 --- a/roles/bitbucket_config/molecule/iam_elasticsearch/converge.yml +++ b/roles/bitbucket_config/molecule/iam_elasticsearch/converge.yml @@ -13,6 +13,7 @@ atl_jdbc_password: 'molecule_password' atl_aws_region: us-east-2 + ansible_ec2_placement_region: 'us-east-2' roles: - role: linux_common diff --git a/roles/confluence_config/molecule/aurora/converge.yml b/roles/confluence_config/molecule/aurora/converge.yml index d57ff60..ff39080 100644 --- a/roles/confluence_config/molecule/aurora/converge.yml +++ b/roles/confluence_config/molecule/aurora/converge.yml @@ -14,6 +14,7 @@ atl_cluster_node_id: 'FAKEID' atl_autologin_cookie_age: "COOKIEAGE" atl_local_ipv4: "1.1.1.1" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/confluence_config/molecule/default/converge.yml b/roles/confluence_config/molecule/default/converge.yml index 5a7ee00..885c6a8 100644 --- a/roles/confluence_config/molecule/default/converge.yml +++ b/roles/confluence_config/molecule/default/converge.yml @@ -21,6 +21,7 @@ atl_proxy_port: "80" atl_db_preferredtestquery: "select 1;" atl_hazelcast_network_aws_tag_key: "my-cluster-tag" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/confluence_config/molecule/password_char_escaping/converge.yml b/roles/confluence_config/molecule/password_char_escaping/converge.yml index c186bb9..069202a 100644 --- a/roles/confluence_config/molecule/password_char_escaping/converge.yml +++ b/roles/confluence_config/molecule/password_char_escaping/converge.yml @@ -18,6 +18,7 @@ atl_tomcat_scheme: "http" atl_proxy_name: "localhost" atl_proxy_port: "80" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/confluence_config/molecule/system_jdk/converge.yml b/roles/confluence_config/molecule/system_jdk/converge.yml index e518a8e..88643fb 100644 --- a/roles/confluence_config/molecule/system_jdk/converge.yml +++ b/roles/confluence_config/molecule/system_jdk/converge.yml @@ -21,6 +21,7 @@ atl_db_preferredtestquery: "select 1;" atl_use_system_jdk: true atl_download_format: "tarball" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/jira_config/molecule/aurora/converge.yml b/roles/jira_config/molecule/aurora/converge.yml index d273f47..d2ac2c3 100644 --- a/roles/jira_config/molecule/aurora/converge.yml +++ b/roles/jira_config/molecule/aurora/converge.yml @@ -6,6 +6,7 @@ atl_product_edition: "jira-software" atl_product_user: "jira" atl_product_version: "7.13.2" + ansible_ec2_placement_region: 'us-east-1' # dbconfig.xml variables atl_jdbc_user: 'atljira' diff --git a/roles/jira_config/molecule/default/converge.yml b/roles/jira_config/molecule/default/converge.yml index 36a90d9..ec345de 100644 --- a/roles/jira_config/molecule/default/converge.yml +++ b/roles/jira_config/molecule/default/converge.yml @@ -6,6 +6,7 @@ atl_product_edition: "jira-software" atl_product_user: "jira" atl_product_version: "7.13.2" + ansible_ec2_placement_region: 'us-east-1' # dbconfig.xml variables atl_jdbc_user: 'atljira' diff --git a/roles/jira_config/molecule/jira_config_props/converge.yml b/roles/jira_config/molecule/jira_config_props/converge.yml index e0b51fa..99d4f54 100644 --- a/roles/jira_config/molecule/jira_config_props/converge.yml +++ b/roles/jira_config/molecule/jira_config_props/converge.yml @@ -6,6 +6,7 @@ atl_product_edition: "jira-software" atl_product_user: "jira" atl_product_version: "7.13.2" + ansible_ec2_placement_region: 'us-east-1' # dbconfig.xml variables atl_jdbc_user: 'atljira' diff --git a/roles/jira_config/molecule/password_char_escaping/converge.yml b/roles/jira_config/molecule/password_char_escaping/converge.yml index 2aa0e9c..4d1397b 100644 --- a/roles/jira_config/molecule/password_char_escaping/converge.yml +++ b/roles/jira_config/molecule/password_char_escaping/converge.yml @@ -6,6 +6,7 @@ atl_product_edition: "jira-software" atl_product_user: "jira" atl_product_version: "7.13.2" + ansible_ec2_placement_region: 'us-east-1' # dbconfig.xml variables atl_jdbc_user: 'atljira' diff --git a/roles/product_install/molecule/bitbucket_latest/converge.yml b/roles/product_install/molecule/bitbucket_latest/converge.yml index 55ad545..db13cc0 100644 --- a/roles/product_install/molecule/bitbucket_latest/converge.yml +++ b/roles/product_install/molecule/bitbucket_latest/converge.yml @@ -5,6 +5,7 @@ atl_product_family: "stash" atl_product_edition: "bitbucket" atl_product_user: "bitbucket" + ansible_ec2_placement_region: 'us-east-1' atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}" roles: diff --git a/roles/product_install/molecule/confluence_latest/converge.yml b/roles/product_install/molecule/confluence_latest/converge.yml index fddd5d1..84d30aa 100644 --- a/roles/product_install/molecule/confluence_latest/converge.yml +++ b/roles/product_install/molecule/confluence_latest/converge.yml @@ -5,6 +5,8 @@ atl_product_family: "confluence" atl_product_edition: "confluence" atl_product_user: "confluence" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/confluence_version_with_uppercase/converge.yml b/roles/product_install/molecule/confluence_version_with_uppercase/converge.yml index 68ab242..8197929 100644 --- a/roles/product_install/molecule/confluence_version_with_uppercase/converge.yml +++ b/roles/product_install/molecule/confluence_version_with_uppercase/converge.yml @@ -6,6 +6,8 @@ atl_product_edition: "confluence" atl_product_user: "confluence" atl_product_version: "7.20.0-CONFSERVER-63193-m01" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/crowd_latest/converge.yml b/roles/product_install/molecule/crowd_latest/converge.yml index 490514e..c94d7cf 100644 --- a/roles/product_install/molecule/crowd_latest/converge.yml +++ b/roles/product_install/molecule/crowd_latest/converge.yml @@ -6,6 +6,8 @@ atl_product_edition: "crowd" atl_product_user: "crowd" atl_download_format: "tarball" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/default/converge.yml b/roles/product_install/molecule/default/converge.yml index ead9819..e0b1474 100644 --- a/roles/product_install/molecule/default/converge.yml +++ b/roles/product_install/molecule/default/converge.yml @@ -5,6 +5,8 @@ atl_product_family: "jira" atl_product_edition: "jira-core" atl_product_user: "jira" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/jira_all/converge.yml b/roles/product_install/molecule/jira_all/converge.yml index 7043280..d52fabf 100644 --- a/roles/product_install/molecule/jira_all/converge.yml +++ b/roles/product_install/molecule/jira_all/converge.yml @@ -14,6 +14,8 @@ atl_jdbc_collation: 'C' atl_jdbc_ctype: 'C' atl_jdbc_template: 'template0' + ansible_ec2_placement_region: 'us-east-1' + pre_tasks: - name: Create cache dir ansible.builtin.file: diff --git a/roles/product_install/molecule/jira_cached_with_downgrade/converge.yml b/roles/product_install/molecule/jira_cached_with_downgrade/converge.yml index c9cf986..fa06125 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/converge.yml +++ b/roles/product_install/molecule/jira_cached_with_downgrade/converge.yml @@ -7,6 +7,7 @@ atl_product_user: "jira" # NOTE: This should be honoured as it is higher than the cached version below. atl_product_version: "7.10.1" + ansible_ec2_placement_region: 'us-east-1' pre_tasks: - name: Create cache dir diff --git a/roles/product_install/molecule/jira_cached_with_upgrade/converge.yml b/roles/product_install/molecule/jira_cached_with_upgrade/converge.yml index f87088e..9824e38 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/converge.yml +++ b/roles/product_install/molecule/jira_cached_with_upgrade/converge.yml @@ -7,6 +7,7 @@ atl_product_user: "jira" # NOTE: This should be honoured as it is higher than the cached version below. atl_product_version: "7.10.1" + ansible_ec2_placement_region: 'us-east-1' pre_tasks: - name: Create cache dir diff --git a/roles/product_install/molecule/jira_software_latest/converge.yml b/roles/product_install/molecule/jira_software_latest/converge.yml index 3f589f0..016ea1d 100644 --- a/roles/product_install/molecule/jira_software_latest/converge.yml +++ b/roles/product_install/molecule/jira_software_latest/converge.yml @@ -6,6 +6,8 @@ atl_product_edition: "jira-software" atl_product_user: "jira" atl_product_version: "latest" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/jira_tarball/converge.yml b/roles/product_install/molecule/jira_tarball/converge.yml index 7d49215..6d649de 100644 --- a/roles/product_install/molecule/jira_tarball/converge.yml +++ b/roles/product_install/molecule/jira_tarball/converge.yml @@ -6,6 +6,8 @@ atl_product_edition: "jira-core" atl_product_user: "jira" atl_download_format: "tarball" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/jira_tarball_download_url/converge.yml b/roles/product_install/molecule/jira_tarball_download_url/converge.yml index 6b455ae..0f5923a 100644 --- a/roles/product_install/molecule/jira_tarball_download_url/converge.yml +++ b/roles/product_install/molecule/jira_tarball_download_url/converge.yml @@ -19,6 +19,7 @@ # When using a tarball the following are also required: atl_download_format: "tarball" atl_use_system_jdk: true + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/product_install/molecule/jira_version_from_file/converge.yml b/roles/product_install/molecule/jira_version_from_file/converge.yml index 0391262..6d203c0 100644 --- a/roles/product_install/molecule/jira_version_from_file/converge.yml +++ b/roles/product_install/molecule/jira_version_from_file/converge.yml @@ -7,6 +7,7 @@ atl_product_user: "jira" # NOTE: This should be ignored because the version file exists (below). atl_product_version: "latest" + ansible_ec2_placement_region: 'us-east-1' pre_tasks: - name: Create cache dir diff --git a/roles/product_install/molecule/jira_version_latest/converge.yml b/roles/product_install/molecule/jira_version_latest/converge.yml index 37a54b1..f3bb1d5 100644 --- a/roles/product_install/molecule/jira_version_latest/converge.yml +++ b/roles/product_install/molecule/jira_version_latest/converge.yml @@ -6,6 +6,8 @@ atl_product_edition: "jira-core" atl_product_user: "jira" atl_product_version: "latest" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/jira_version_override/converge.yml b/roles/product_install/molecule/jira_version_override/converge.yml index 7074099..fc8cbd2 100644 --- a/roles/product_install/molecule/jira_version_override/converge.yml +++ b/roles/product_install/molecule/jira_version_override/converge.yml @@ -6,6 +6,8 @@ atl_product_edition: "jira-core" atl_product_user: "jira" atl_product_version: "7.13.2" + ansible_ec2_placement_region: 'us-east-1' + roles: - role: linux_common - role: product_common diff --git a/roles/product_install/molecule/servicedesk3/converge.yml b/roles/product_install/molecule/servicedesk3/converge.yml index fe8aa7f..2b59892 100644 --- a/roles/product_install/molecule/servicedesk3/converge.yml +++ b/roles/product_install/molecule/servicedesk3/converge.yml @@ -6,6 +6,7 @@ atl_product_family: "jira" atl_product_user: "jira" atl_product_version: "3.9.0" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/product_install/molecule/servicedesk4/converge.yml b/roles/product_install/molecule/servicedesk4/converge.yml index 2e5fb79..fd0d0e8 100644 --- a/roles/product_install/molecule/servicedesk4/converge.yml +++ b/roles/product_install/molecule/servicedesk4/converge.yml @@ -6,6 +6,7 @@ atl_product_family: "jira" atl_product_user: "jira" atl_product_version: "4.1.0" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common diff --git a/roles/product_install/molecule/servicedesk_latest/converge.yml b/roles/product_install/molecule/servicedesk_latest/converge.yml index d17a735..8b8394c 100644 --- a/roles/product_install/molecule/servicedesk_latest/converge.yml +++ b/roles/product_install/molecule/servicedesk_latest/converge.yml @@ -6,6 +6,7 @@ atl_product_family: "jira" atl_product_user: "jira" atl_product_version: "latest" + ansible_ec2_placement_region: 'us-east-1' roles: - role: linux_common