From 44ae6da47bc9f71f418d1c81f0ef268ff6fbb9c7 Mon Sep 17 00:00:00 2001 From: Ben Partridge Date: Fri, 24 Jan 2020 11:55:11 +1100 Subject: [PATCH 1/4] no-issue: Use product name to generate servicename instead of product edition --- aws_slingshot_backup.yml | 3 +-- roles/create_backups/defaults/main.yml | 2 +- roles/create_backups/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/aws_slingshot_backup.yml b/aws_slingshot_backup.yml index 57b9690..e0239f6 100644 --- a/aws_slingshot_backup.yml +++ b/aws_slingshot_backup.yml @@ -1,8 +1,7 @@ # Runs atlassian-slingshot to backup your product instance. Should be run when there is only 1 app node (i.e server or single node cluster) # Params # Required -# atl_product_edition - one of "confluence", "jira", or "bitbucket". -# atl_product_family - should be the same as the "atl_product_edition" +# atl_product - one of "confluence", "jira", or "bitbucket". # atl_slingshot_backup_dir - working directory for the backup, should be large enough to fit database and shared home dumps # atl_s3_backup_bucket - s3 bucket to upload your backup to # atl_s3_backup_region - AWS region where the s3 bucket is deployed diff --git a/roles/create_backups/defaults/main.yml b/roles/create_backups/defaults/main.yml index e00f60f..3a10120 100644 --- a/roles/create_backups/defaults/main.yml +++ b/roles/create_backups/defaults/main.yml @@ -1,7 +1,7 @@ --- atl_db_port: 5432 -atl_systemd_service_name: "{{ atl_product_edition }}.service" +atl_systemd_service_name: "{{ atl_product }}.service" atl_slingshot_yum_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-rpm' atl_amazon_extras_postgresql_version: '9.6' diff --git a/roles/create_backups/tasks/main.yml b/roles/create_backups/tasks/main.yml index 5342bc1..fe6c0da 100644 --- a/roles/create_backups/tasks/main.yml +++ b/roles/create_backups/tasks/main.yml @@ -3,7 +3,7 @@ - name: Install distro-specific backup support packages include_tasks: "{{ ansible_distribution|lower }}.yml" -- name: Stop the {{ atl_product_edition }} service +- name: Stop the {{ atl_product }} service service: name: "{{ atl_systemd_service_name }}" state: stopped From 5df8552861cd3de7663f0347f2c1faf80975ab90 Mon Sep 17 00:00:00 2001 From: Ben Partridge Date: Fri, 24 Jan 2020 12:14:26 +1100 Subject: [PATCH 2/4] no-issue: re-add atl_product_family as required var for slingshot backup play --- aws_slingshot_backup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_slingshot_backup.yml b/aws_slingshot_backup.yml index e0239f6..50028b4 100644 --- a/aws_slingshot_backup.yml +++ b/aws_slingshot_backup.yml @@ -1,7 +1,7 @@ # Runs atlassian-slingshot to backup your product instance. Should be run when there is only 1 app node (i.e server or single node cluster) # Params # Required -# atl_product - one of "confluence", "jira", or "bitbucket". +# atl_product_family - should be "jira", "confluence", or "bitbucket" # atl_slingshot_backup_dir - working directory for the backup, should be large enough to fit database and shared home dumps # atl_s3_backup_bucket - s3 bucket to upload your backup to # atl_s3_backup_region - AWS region where the s3 bucket is deployed From e9943cece5e087a1c5b426e49fed1146861de5c0 Mon Sep 17 00:00:00 2001 From: Ben Partridge Date: Fri, 24 Jan 2020 12:15:15 +1100 Subject: [PATCH 3/4] no-issue: Replace old references to atl_product with atl_product_family --- roles/create_backups/defaults/main.yml | 2 +- roles/create_backups/tasks/main.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/create_backups/defaults/main.yml b/roles/create_backups/defaults/main.yml index 3a10120..f500922 100644 --- a/roles/create_backups/defaults/main.yml +++ b/roles/create_backups/defaults/main.yml @@ -1,7 +1,7 @@ --- atl_db_port: 5432 -atl_systemd_service_name: "{{ atl_product }}.service" +atl_systemd_service_name: "{{ atl_product_family }}.service" atl_slingshot_yum_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-rpm' atl_amazon_extras_postgresql_version: '9.6' diff --git a/roles/create_backups/tasks/main.yml b/roles/create_backups/tasks/main.yml index fe6c0da..b72e274 100644 --- a/roles/create_backups/tasks/main.yml +++ b/roles/create_backups/tasks/main.yml @@ -3,7 +3,7 @@ - name: Install distro-specific backup support packages include_tasks: "{{ ansible_distribution|lower }}.yml" -- name: Stop the {{ atl_product }} service +- name: Stop the {{ atl_product_family }} service service: name: "{{ atl_systemd_service_name }}" state: stopped @@ -33,7 +33,7 @@ environment: ATL_DB_PASSWORD: "{{ atl_jdbc_password }}" -- name: Restart the {{ atl_product_edition }} service +- name: Restart the {{ atl_product_family }} service service: name: "{{ atl_systemd_service_name }}" state: restarted From 6e5da43ab19cd2fbeaec4cb6e131f8cf3b72a421 Mon Sep 17 00:00:00 2001 From: Ben Partridge Date: Fri, 24 Jan 2020 13:55:32 +1100 Subject: [PATCH 4/4] no-issue: Correct documentation for product family for bitbucket service name --- aws_slingshot_backup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_slingshot_backup.yml b/aws_slingshot_backup.yml index 50028b4..f638680 100644 --- a/aws_slingshot_backup.yml +++ b/aws_slingshot_backup.yml @@ -1,7 +1,7 @@ # Runs atlassian-slingshot to backup your product instance. Should be run when there is only 1 app node (i.e server or single node cluster) # Params # Required -# atl_product_family - should be "jira", "confluence", or "bitbucket" +# atl_product_family - should be "jira", "confluence", or "stash" # atl_slingshot_backup_dir - working directory for the backup, should be large enough to fit database and shared home dumps # atl_s3_backup_bucket - s3 bucket to upload your backup to # atl_s3_backup_region - AWS region where the s3 bucket is deployed