From f2a9dbd1b68d91a88cf14cbff06ae57fffb27f34 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 16 Apr 2019 09:37:15 +1000 Subject: [PATCH] DCD-224: Remove jira_config for now. --- roles/jira_config/.yamllint | 11 ---------- .../molecule/default/Dockerfile.j2 | 14 ------------- .../jira_config/molecule/default/molecule.yml | 20 ------------------- .../jira_config/molecule/default/playbook.yml | 11 ---------- .../molecule/default/tests/test_default.py | 16 --------------- roles/jira_config/tasks/main.yml | 7 ------- roles/jira_config/templates/jira.varfile.j2 | 12 ----------- 7 files changed, 91 deletions(-) delete mode 100644 roles/jira_config/.yamllint delete mode 100644 roles/jira_config/molecule/default/Dockerfile.j2 delete mode 100644 roles/jira_config/molecule/default/molecule.yml delete mode 100644 roles/jira_config/molecule/default/playbook.yml delete mode 100644 roles/jira_config/molecule/default/tests/test_default.py delete mode 100644 roles/jira_config/tasks/main.yml delete mode 100644 roles/jira_config/templates/jira.varfile.j2 diff --git a/roles/jira_config/.yamllint b/roles/jira_config/.yamllint deleted file mode 100644 index ad0be76..0000000 --- a/roles/jira_config/.yamllint +++ /dev/null @@ -1,11 +0,0 @@ -extends: default - -rules: - braces: - max-spaces-inside: 1 - level: error - brackets: - max-spaces-inside: 1 - level: error - line-length: disable - truthy: disable diff --git a/roles/jira_config/molecule/default/Dockerfile.j2 b/roles/jira_config/molecule/default/Dockerfile.j2 deleted file mode 100644 index e6aa95d..0000000 --- a/roles/jira_config/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,14 +0,0 @@ -# Molecule managed - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \ - elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi diff --git a/roles/jira_config/molecule/default/molecule.yml b/roles/jira_config/molecule/default/molecule.yml deleted file mode 100644 index c6a6d26..0000000 --- a/roles/jira_config/molecule/default/molecule.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -lint: - name: yamllint -platforms: - - name: amazon_linux2 - image: amazonlinux:2 - - name: ubuntu_lts - image: ubuntu:bionic -provisioner: - name: ansible - lint: - name: ansible-lint -verifier: - name: testinfra - lint: - name: flake8 diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/playbook.yml deleted file mode 100644 index ed375e9..0000000 --- a/roles/jira_config/molecule/default/playbook.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Converge - hosts: all - vars: - atl_product_user: "jira" - atl_product_home: "/var/atlassian/application-data/jira" - atl_product_installation_dir: "/opt/atlassian/jira" - atl_installer_temp: "/opt/atlassian/tmp" - roles: - - role: product_common - - role: jira_config diff --git a/roles/jira_config/molecule/default/tests/test_default.py b/roles/jira_config/molecule/default/tests/test_default.py deleted file mode 100644 index 1e076e7..0000000 --- a/roles/jira_config/molecule/default/tests/test_default.py +++ /dev/null @@ -1,16 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') - - -def test_varfile(host): - f = host.file('/opt/atlassian/tmp/jira.varfile') - assert f.exists - assert f.is_file - assert f.user == 'jira' - assert f.contains("app.jiraHome=/var/atlassian/application-data/jira") - assert f.contains("existingInstallationDir=/opt/atlassian/jira") - assert f.contains("sys.installationDir=/opt/atlassian/jira") diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml deleted file mode 100644 index 42cb0cc..0000000 --- a/roles/jira_config/tasks/main.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -- name: Create installer seed varfile - template: - src: jira.varfile.j2 - dest: "{{ atl_installer_temp }}/jira.varfile" - owner: "{{ atl_product_user }}" diff --git a/roles/jira_config/templates/jira.varfile.j2 b/roles/jira_config/templates/jira.varfile.j2 deleted file mode 100644 index 103df5f..0000000 --- a/roles/jira_config/templates/jira.varfile.j2 +++ /dev/null @@ -1,12 +0,0 @@ -launch.application$Boolean=false -rmiPort$Long=8005 -app.jiraHome={{ atl_product_home }} -app.install.service$Boolean=true -existingInstallationDir={{ atl_product_installation_dir }} -sys.confirmedUpdateInstallationString=false -sys.languageId=en -sys.installationDir={{ atl_product_installation_dir }} -executeLauncherAction$Boolean=true -httpPort$Long=8080 -portChoice=default -executeLauncherAction$Boolean=false