DCD-224: Rename product vars for clarity and create the shared home.

This commit is contained in:
Steve Smith
2019-04-11 15:19:57 +10:00
parent 5feca0132f
commit 6db317051a
5 changed files with 10 additions and 6 deletions

View File

@@ -3,8 +3,9 @@
become: true become: true
vars: vars:
atl_product: jira atl_product_family: "jira"
atl_product_user: jira atl_product_edition: "jira-software"
atl_product_user: "jira"
roles: roles:
- linux_common - linux_common

View File

@@ -10,9 +10,10 @@ postgres_version: "9.6"
git_version: "2.14.4" git_version: "2.14.4"
atl_shared_mountpoint: "/media/atl" atl_shared_mountpoint: "/media/atl"
# FIXME: Some of these could be overridden from the environment. # FIXME: Some of these should be overridden from the environment?
atl_home_base: "/var/atlassian/application-data" atl_home_base: "/var/atlassian/application-data"
atl_product_home: "{{ atl_home_base }}/{{ atl_product }}" atl_product_home: "{{ atl_home_base }}/{{ atl_product_family }}"
atl_product_home_shared: "{{ atl_shared_mountpoint }}/{{ atl_product_family }}/shared"
atl_product_installation_base: "/opt/atlassian" atl_product_installation_base: "/opt/atlassian"
atl_product_installation_dir: "{{ atl_product_installation_base }}/{{ atl_product }}" atl_product_installation_dir: "{{ atl_product_installation_base }}/{{ atl_product }}"
@@ -22,4 +23,3 @@ atl_installer_temp: "{{ atl_product_installation_base }}/tmp"
# set in /etc/atl by the CloudFormation template and sourced before # set in /etc/atl by the CloudFormation template and sourced before
# Ansible is run. See bin/ansible-with-atl-env for a convenient wrapper # Ansible is run. See bin/ansible-with-atl-env for a convenient wrapper
atl_efs_id: "{{ lookup('env', 'ATL_EFS_ID') }}" atl_efs_id: "{{ lookup('env', 'ATL_EFS_ID') }}"

View File

@@ -5,6 +5,7 @@
atl_product_user: "testuser" atl_product_user: "testuser"
atl_product_home: "/opt/atlassian/product" atl_product_home: "/opt/atlassian/product"
atl_installer_temp: "/opt/atlassian/temp" atl_installer_temp: "/opt/atlassian/temp"
atl_product_home_shared: "/media/atl/jira/shared"
roles: roles:
- role: linux_common - role: linux_common
- role: product_common - role: product_common

View File

@@ -14,7 +14,8 @@ def test_user_created(host):
@pytest.mark.parametrize('target', [ @pytest.mark.parametrize('target', [
'/opt/atlassian/product', '/opt/atlassian/product',
'/opt/atlassian/temp' '/opt/atlassian/temp',
'/media/atl/jira/shared'
]) ])
def test_dirs_created(host, target): def test_dirs_created(host, target):
d = host.file(target) d = host.file(target)

View File

@@ -17,3 +17,4 @@
with_items: with_items:
- "{{ atl_product_home }}" - "{{ atl_product_home }}"
- "{{ atl_installer_temp }}" - "{{ atl_installer_temp }}"
- "{{ atl_product_home_shared }}"