diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 6de2fd6..f711762 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -39,7 +39,7 @@ We’re going to check that the role that downloads the products works for both Jira Core and Confluence, on boths supported Linux distributions. So run the following: - cd roles/installer_download/ + cd roles/product_install/ molecule test -s jira_version_latest molecule test -s servicedesk3 diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml index 410de0e..a9d7436 100644 --- a/aws_jira_dc_node.yml +++ b/aws_jira_dc_node.yml @@ -12,7 +12,7 @@ - role: aws_common - role: aws_efs_config - role: product_common - - role: installer_download - - role: database_config + - role: product_install + - role: database_init - role: jira_config - role: jira_startup diff --git a/roles/database_config/.yamllint b/roles/database_init/.yamllint similarity index 100% rename from roles/database_config/.yamllint rename to roles/database_init/.yamllint diff --git a/roles/database_config/defaults/main.yml b/roles/database_init/defaults/main.yml similarity index 100% rename from roles/database_config/defaults/main.yml rename to roles/database_init/defaults/main.yml diff --git a/roles/database_config/tasks/main.yml b/roles/database_init/tasks/main.yml similarity index 100% rename from roles/database_config/tasks/main.yml rename to roles/database_init/tasks/main.yml diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml index 8365acf..3ccb136 100644 --- a/roles/jira_config/molecule/default/playbook.yml +++ b/roles/jira_config/molecule/default/playbook.yml @@ -12,5 +12,5 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install - role: jira_config diff --git a/roles/installer_download/.yamllint b/roles/product_install/.yamllint similarity index 100% rename from roles/installer_download/.yamllint rename to roles/product_install/.yamllint diff --git a/roles/installer_download/defaults/main.yml b/roles/product_install/defaults/main.yml similarity index 100% rename from roles/installer_download/defaults/main.yml rename to roles/product_install/defaults/main.yml diff --git a/roles/installer_download/molecule/bitbucket_latest/Dockerfile.j2 b/roles/product_install/molecule/bitbucket_latest/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/bitbucket_latest/Dockerfile.j2 rename to roles/product_install/molecule/bitbucket_latest/Dockerfile.j2 diff --git a/roles/installer_download/molecule/bitbucket_latest/molecule.yml.disabled b/roles/product_install/molecule/bitbucket_latest/molecule.yml.disabled similarity index 100% rename from roles/installer_download/molecule/bitbucket_latest/molecule.yml.disabled rename to roles/product_install/molecule/bitbucket_latest/molecule.yml.disabled diff --git a/roles/installer_download/molecule/bitbucket_latest/playbook.yml b/roles/product_install/molecule/bitbucket_latest/playbook.yml similarity index 86% rename from roles/installer_download/molecule/bitbucket_latest/playbook.yml rename to roles/product_install/molecule/bitbucket_latest/playbook.yml index 43bb7cf..b9eb653 100644 --- a/roles/installer_download/molecule/bitbucket_latest/playbook.yml +++ b/roles/product_install/molecule/bitbucket_latest/playbook.yml @@ -8,4 +8,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/bitbucket_latest/tests/#test_default.py# b/roles/product_install/molecule/bitbucket_latest/tests/#test_default.py# similarity index 100% rename from roles/installer_download/molecule/bitbucket_latest/tests/#test_default.py# rename to roles/product_install/molecule/bitbucket_latest/tests/#test_default.py# diff --git a/roles/installer_download/molecule/bitbucket_latest/tests/test_default.py b/roles/product_install/molecule/bitbucket_latest/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/bitbucket_latest/tests/test_default.py rename to roles/product_install/molecule/bitbucket_latest/tests/test_default.py diff --git a/roles/installer_download/molecule/confluence_latest/Dockerfile.j2 b/roles/product_install/molecule/confluence_latest/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/confluence_latest/Dockerfile.j2 rename to roles/product_install/molecule/confluence_latest/Dockerfile.j2 diff --git a/roles/installer_download/molecule/confluence_latest/molecule.yml b/roles/product_install/molecule/confluence_latest/molecule.yml similarity index 100% rename from roles/installer_download/molecule/confluence_latest/molecule.yml rename to roles/product_install/molecule/confluence_latest/molecule.yml diff --git a/roles/installer_download/molecule/confluence_latest/playbook.yml b/roles/product_install/molecule/confluence_latest/playbook.yml similarity index 87% rename from roles/installer_download/molecule/confluence_latest/playbook.yml rename to roles/product_install/molecule/confluence_latest/playbook.yml index 6827228..fddd5d1 100644 --- a/roles/installer_download/molecule/confluence_latest/playbook.yml +++ b/roles/product_install/molecule/confluence_latest/playbook.yml @@ -8,4 +8,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/confluence_latest/tests/test_default.py b/roles/product_install/molecule/confluence_latest/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/confluence_latest/tests/test_default.py rename to roles/product_install/molecule/confluence_latest/tests/test_default.py diff --git a/roles/installer_download/molecule/default/Dockerfile.j2 b/roles/product_install/molecule/default/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/default/Dockerfile.j2 rename to roles/product_install/molecule/default/Dockerfile.j2 diff --git a/roles/installer_download/molecule/default/molecule.yml b/roles/product_install/molecule/default/molecule.yml similarity index 100% rename from roles/installer_download/molecule/default/molecule.yml rename to roles/product_install/molecule/default/molecule.yml diff --git a/roles/installer_download/molecule/default/playbook.yml b/roles/product_install/molecule/default/playbook.yml similarity index 86% rename from roles/installer_download/molecule/default/playbook.yml rename to roles/product_install/molecule/default/playbook.yml index 67e1197..ead9819 100644 --- a/roles/installer_download/molecule/default/playbook.yml +++ b/roles/product_install/molecule/default/playbook.yml @@ -8,4 +8,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/default/tests/test_default.py rename to roles/product_install/molecule/default/tests/test_default.py diff --git a/roles/installer_download/molecule/jira_version_from_file/Dockerfile.j2 b/roles/product_install/molecule/jira_version_from_file/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/jira_version_from_file/Dockerfile.j2 rename to roles/product_install/molecule/jira_version_from_file/Dockerfile.j2 diff --git a/roles/installer_download/molecule/jira_version_from_file/molecule.yml b/roles/product_install/molecule/jira_version_from_file/molecule.yml similarity index 100% rename from roles/installer_download/molecule/jira_version_from_file/molecule.yml rename to roles/product_install/molecule/jira_version_from_file/molecule.yml diff --git a/roles/installer_download/molecule/jira_version_from_file/playbook.yml b/roles/product_install/molecule/jira_version_from_file/playbook.yml similarity index 94% rename from roles/installer_download/molecule/jira_version_from_file/playbook.yml rename to roles/product_install/molecule/jira_version_from_file/playbook.yml index 0782261..8190b68 100644 --- a/roles/installer_download/molecule/jira_version_from_file/playbook.yml +++ b/roles/product_install/molecule/jira_version_from_file/playbook.yml @@ -21,4 +21,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/jira_version_from_file/tests/test_default.py b/roles/product_install/molecule/jira_version_from_file/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/jira_version_from_file/tests/test_default.py rename to roles/product_install/molecule/jira_version_from_file/tests/test_default.py diff --git a/roles/installer_download/molecule/jira_version_latest/Dockerfile.j2 b/roles/product_install/molecule/jira_version_latest/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/jira_version_latest/Dockerfile.j2 rename to roles/product_install/molecule/jira_version_latest/Dockerfile.j2 diff --git a/roles/installer_download/molecule/jira_version_latest/molecule.yml b/roles/product_install/molecule/jira_version_latest/molecule.yml similarity index 100% rename from roles/installer_download/molecule/jira_version_latest/molecule.yml rename to roles/product_install/molecule/jira_version_latest/molecule.yml diff --git a/roles/installer_download/molecule/jira_version_latest/playbook.yml b/roles/product_install/molecule/jira_version_latest/playbook.yml similarity index 88% rename from roles/installer_download/molecule/jira_version_latest/playbook.yml rename to roles/product_install/molecule/jira_version_latest/playbook.yml index 7e0728c..37a54b1 100644 --- a/roles/installer_download/molecule/jira_version_latest/playbook.yml +++ b/roles/product_install/molecule/jira_version_latest/playbook.yml @@ -9,4 +9,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/jira_version_latest/tests/test_default.py b/roles/product_install/molecule/jira_version_latest/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/jira_version_latest/tests/test_default.py rename to roles/product_install/molecule/jira_version_latest/tests/test_default.py diff --git a/roles/installer_download/molecule/jira_version_override/Dockerfile.j2 b/roles/product_install/molecule/jira_version_override/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/jira_version_override/Dockerfile.j2 rename to roles/product_install/molecule/jira_version_override/Dockerfile.j2 diff --git a/roles/installer_download/molecule/jira_version_override/molecule.yml b/roles/product_install/molecule/jira_version_override/molecule.yml similarity index 100% rename from roles/installer_download/molecule/jira_version_override/molecule.yml rename to roles/product_install/molecule/jira_version_override/molecule.yml diff --git a/roles/installer_download/molecule/jira_version_override/playbook.yml b/roles/product_install/molecule/jira_version_override/playbook.yml similarity index 88% rename from roles/installer_download/molecule/jira_version_override/playbook.yml rename to roles/product_install/molecule/jira_version_override/playbook.yml index fa175b7..7074099 100644 --- a/roles/installer_download/molecule/jira_version_override/playbook.yml +++ b/roles/product_install/molecule/jira_version_override/playbook.yml @@ -9,4 +9,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/jira_version_override/tests/test_default.py b/roles/product_install/molecule/jira_version_override/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/jira_version_override/tests/test_default.py rename to roles/product_install/molecule/jira_version_override/tests/test_default.py diff --git a/roles/installer_download/molecule/resources/tests/test_common.py b/roles/product_install/molecule/resources/tests/test_common.py similarity index 100% rename from roles/installer_download/molecule/resources/tests/test_common.py rename to roles/product_install/molecule/resources/tests/test_common.py diff --git a/roles/installer_download/molecule/servicedesk3/Dockerfile.j2 b/roles/product_install/molecule/servicedesk3/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/servicedesk3/Dockerfile.j2 rename to roles/product_install/molecule/servicedesk3/Dockerfile.j2 diff --git a/roles/installer_download/molecule/servicedesk3/molecule.yml b/roles/product_install/molecule/servicedesk3/molecule.yml similarity index 100% rename from roles/installer_download/molecule/servicedesk3/molecule.yml rename to roles/product_install/molecule/servicedesk3/molecule.yml diff --git a/roles/installer_download/molecule/servicedesk3/playbook.yml b/roles/product_install/molecule/servicedesk3/playbook.yml similarity index 88% rename from roles/installer_download/molecule/servicedesk3/playbook.yml rename to roles/product_install/molecule/servicedesk3/playbook.yml index 172dc4b..fe8aa7f 100644 --- a/roles/installer_download/molecule/servicedesk3/playbook.yml +++ b/roles/product_install/molecule/servicedesk3/playbook.yml @@ -10,4 +10,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/servicedesk3/tests/test_default.py b/roles/product_install/molecule/servicedesk3/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/servicedesk3/tests/test_default.py rename to roles/product_install/molecule/servicedesk3/tests/test_default.py diff --git a/roles/installer_download/molecule/servicedesk4/Dockerfile.j2 b/roles/product_install/molecule/servicedesk4/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/servicedesk4/Dockerfile.j2 rename to roles/product_install/molecule/servicedesk4/Dockerfile.j2 diff --git a/roles/installer_download/molecule/servicedesk4/molecule.yml b/roles/product_install/molecule/servicedesk4/molecule.yml similarity index 100% rename from roles/installer_download/molecule/servicedesk4/molecule.yml rename to roles/product_install/molecule/servicedesk4/molecule.yml diff --git a/roles/installer_download/molecule/servicedesk4/playbook.yml b/roles/product_install/molecule/servicedesk4/playbook.yml similarity index 88% rename from roles/installer_download/molecule/servicedesk4/playbook.yml rename to roles/product_install/molecule/servicedesk4/playbook.yml index 64c8c85..2e5fb79 100644 --- a/roles/installer_download/molecule/servicedesk4/playbook.yml +++ b/roles/product_install/molecule/servicedesk4/playbook.yml @@ -10,4 +10,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/servicedesk4/tests/test_default.py b/roles/product_install/molecule/servicedesk4/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/servicedesk4/tests/test_default.py rename to roles/product_install/molecule/servicedesk4/tests/test_default.py diff --git a/roles/installer_download/molecule/servicedesk_latest/Dockerfile.j2 b/roles/product_install/molecule/servicedesk_latest/Dockerfile.j2 similarity index 100% rename from roles/installer_download/molecule/servicedesk_latest/Dockerfile.j2 rename to roles/product_install/molecule/servicedesk_latest/Dockerfile.j2 diff --git a/roles/installer_download/molecule/servicedesk_latest/molecule.yml b/roles/product_install/molecule/servicedesk_latest/molecule.yml similarity index 100% rename from roles/installer_download/molecule/servicedesk_latest/molecule.yml rename to roles/product_install/molecule/servicedesk_latest/molecule.yml diff --git a/roles/installer_download/molecule/servicedesk_latest/playbook.yml b/roles/product_install/molecule/servicedesk_latest/playbook.yml similarity index 88% rename from roles/installer_download/molecule/servicedesk_latest/playbook.yml rename to roles/product_install/molecule/servicedesk_latest/playbook.yml index 38a132a..d17a735 100644 --- a/roles/installer_download/molecule/servicedesk_latest/playbook.yml +++ b/roles/product_install/molecule/servicedesk_latest/playbook.yml @@ -10,4 +10,4 @@ roles: - role: linux_common - role: product_common - - role: installer_download + - role: product_install diff --git a/roles/installer_download/molecule/servicedesk_latest/tests/test_default.py b/roles/product_install/molecule/servicedesk_latest/tests/test_default.py similarity index 100% rename from roles/installer_download/molecule/servicedesk_latest/tests/test_default.py rename to roles/product_install/molecule/servicedesk_latest/tests/test_default.py diff --git a/roles/installer_download/tasks/cached_version_fetch.yml b/roles/product_install/tasks/cached_version_fetch.yml similarity index 100% rename from roles/installer_download/tasks/cached_version_fetch.yml rename to roles/product_install/tasks/cached_version_fetch.yml diff --git a/roles/installer_download/tasks/cached_version_write.yml b/roles/product_install/tasks/cached_version_write.yml similarity index 100% rename from roles/installer_download/tasks/cached_version_write.yml rename to roles/product_install/tasks/cached_version_write.yml diff --git a/roles/installer_download/tasks/create_dirs.yml b/roles/product_install/tasks/create_dirs.yml similarity index 100% rename from roles/installer_download/tasks/create_dirs.yml rename to roles/product_install/tasks/create_dirs.yml diff --git a/roles/installer_download/tasks/fetch_product.yml b/roles/product_install/tasks/fetch_product.yml similarity index 100% rename from roles/installer_download/tasks/fetch_product.yml rename to roles/product_install/tasks/fetch_product.yml diff --git a/roles/installer_download/tasks/main.yml b/roles/product_install/tasks/main.yml similarity index 100% rename from roles/installer_download/tasks/main.yml rename to roles/product_install/tasks/main.yml diff --git a/roles/installer_download/tasks/product_download.yml b/roles/product_install/tasks/product_download.yml similarity index 100% rename from roles/installer_download/tasks/product_download.yml rename to roles/product_install/tasks/product_download.yml diff --git a/roles/installer_download/tasks/servicedesk_download.yml b/roles/product_install/tasks/servicedesk_download.yml similarity index 100% rename from roles/installer_download/tasks/servicedesk_download.yml rename to roles/product_install/tasks/servicedesk_download.yml diff --git a/roles/installer_download/templates/confluence.varfile.j2 b/roles/product_install/templates/confluence.varfile.j2 similarity index 100% rename from roles/installer_download/templates/confluence.varfile.j2 rename to roles/product_install/templates/confluence.varfile.j2 diff --git a/roles/installer_download/templates/jira.varfile.j2 b/roles/product_install/templates/jira.varfile.j2 similarity index 100% rename from roles/installer_download/templates/jira.varfile.j2 rename to roles/product_install/templates/jira.varfile.j2 diff --git a/roles/installer_download/templates/stash.varfile.j2 b/roles/product_install/templates/stash.varfile.j2 similarity index 100% rename from roles/installer_download/templates/stash.varfile.j2 rename to roles/product_install/templates/stash.varfile.j2 diff --git a/roles/installer_download/templates/version.j2 b/roles/product_install/templates/version.j2 similarity index 100% rename from roles/installer_download/templates/version.j2 rename to roles/product_install/templates/version.j2