From c3db08e6db88a9da48f173b7b6a5979f1c80fc0c Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Tue, 27 Jun 2017 14:42:36 +0200 Subject: [PATCH] Split tomcat-instance in tomcat + tomcat-instance --- tomcat-instance/README.md | 1 - tomcat-instance/defaults/main.yml | 2 -- tomcat-instance/meta/main.yml | 7 ++--- tomcat-instance/tasks/main.yml | 9 ------ tomcat/.kitchen.yml | 28 +++++++++++++++++++ tomcat/README.md | 7 +++++ tomcat/defaults/main.yml | 2 ++ .../files/tomcat.service | 0 {tomcat-instance => tomcat}/handlers/main.yml | 0 tomcat/meta/main.yml | 19 +++++++++++++ tomcat/tasks/main.yml | 3 ++ {tomcat-instance => tomcat}/tasks/nagios.yml | 2 +- .../tomcat.yml => tomcat/tasks/packages.yml | 2 +- .../templates/check_tomcat_instance.sh.j2 | 0 14 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 tomcat/.kitchen.yml create mode 100644 tomcat/README.md create mode 100644 tomcat/defaults/main.yml rename {tomcat-instance => tomcat}/files/tomcat.service (100%) rename {tomcat-instance => tomcat}/handlers/main.yml (100%) create mode 100644 tomcat/meta/main.yml create mode 100644 tomcat/tasks/main.yml rename {tomcat-instance => tomcat}/tasks/nagios.yml (93%) rename tomcat-instance/tasks/tomcat.yml => tomcat/tasks/packages.yml (93%) rename {tomcat-instance => tomcat}/templates/check_tomcat_instance.sh.j2 (100%) diff --git a/tomcat-instance/README.md b/tomcat-instance/README.md index d6e597b0..ed427442 100644 --- a/tomcat-instance/README.md +++ b/tomcat-instance/README.md @@ -5,7 +5,6 @@ Install a Tomcat Instance with an independent Unix user and use of systemd user ## Available variables **tomcat_instance_name **: Name of Tomcat instance and proprietary user and group (***required***) -**tomcat_instance_root:** Root dir for Tomcat instance (default: /srv/tomcat) **tomcat_instance_port**: HTTP port for Tomcat instance and uid/gid for Tomcat user and group (default: 8080) **tomcat_instance_shutdown**: Port for Tomcat shutdown (default: HTTP port + 1) **tomcat_instance_ram**: Max memory for Tomcat instance (default: 512) diff --git a/tomcat-instance/defaults/main.yml b/tomcat-instance/defaults/main.yml index 75ef7e71..e555e2cd 100644 --- a/tomcat-instance/defaults/main.yml +++ b/tomcat-instance/defaults/main.yml @@ -1,4 +1,2 @@ --- tomcat_instance_root: '/srv/tomcat' -tomcat_instance_port: 8080 -tomcat_instance_ram: 512 diff --git a/tomcat-instance/meta/main.yml b/tomcat-instance/meta/main.yml index abc2a536..015c77eb 100644 --- a/tomcat-instance/meta/main.yml +++ b/tomcat-instance/meta/main.yml @@ -1,3 +1,4 @@ +--- galaxy_info: author: Evolix description: Configuration of a Tomcat instance. @@ -13,7 +14,5 @@ galaxy_info: versions: - jessie -dependencies: [] - # List your role dependencies here, one per line. - # Be sure to remove the '[]' above if you add dependencies - # to this list. +dependencies: +- tomcat diff --git a/tomcat-instance/tasks/main.yml b/tomcat-instance/tasks/main.yml index 93653ed8..1da21794 100644 --- a/tomcat-instance/tasks/main.yml +++ b/tomcat-instance/tasks/main.yml @@ -1,15 +1,6 @@ --- - -- include: tomcat.yml - -- include: nagios.yml - - include: check.yml - - include: user.yml - - include: systemd.yml - - include: alias.yml - - include: bootstrap.yml diff --git a/tomcat/.kitchen.yml b/tomcat/.kitchen.yml new file mode 100644 index 00000000..b21cc3db --- /dev/null +++ b/tomcat/.kitchen.yml @@ -0,0 +1,28 @@ +--- +driver: + name: docker + privileged: true + use_sudo: false + +provisioner: + name: ansible_playbook + hosts: test-kitchen + roles_path: ../ + ansible_verbose: true + require_ansible_source: false + require_chef_for_busser: false + idempotency_test: true + +platforms: + - name: debian + driver_config: + image: evolix/ansible:2.2.1 + +suites: + - name: default + provisioner: + name: ansible_playbook + playbook: ./tests/test.yml + +transport: + max_ssh_sessions: 6 diff --git a/tomcat/README.md b/tomcat/README.md new file mode 100644 index 00000000..3f0a1de0 --- /dev/null +++ b/tomcat/README.md @@ -0,0 +1,7 @@ +# tomcat + +Install a Tomcat depndancies for multiple tomcat instance. + +## Available variables + +**tomcat_instance_root:** Root dir for Tomcat instance (default: /srv/tomcat) diff --git a/tomcat/defaults/main.yml b/tomcat/defaults/main.yml new file mode 100644 index 00000000..e555e2cd --- /dev/null +++ b/tomcat/defaults/main.yml @@ -0,0 +1,2 @@ +--- +tomcat_instance_root: '/srv/tomcat' diff --git a/tomcat-instance/files/tomcat.service b/tomcat/files/tomcat.service similarity index 100% rename from tomcat-instance/files/tomcat.service rename to tomcat/files/tomcat.service diff --git a/tomcat-instance/handlers/main.yml b/tomcat/handlers/main.yml similarity index 100% rename from tomcat-instance/handlers/main.yml rename to tomcat/handlers/main.yml diff --git a/tomcat/meta/main.yml b/tomcat/meta/main.yml new file mode 100644 index 00000000..747c9e55 --- /dev/null +++ b/tomcat/meta/main.yml @@ -0,0 +1,19 @@ +galaxy_info: + author: Evolix + description: Installation of a Tomcat. + + issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues + + license: GPLv2 + + min_ansible_version: 2.2 + + platforms: + - name: Debian + versions: + - jessie + +dependencies: [] + # List your role dependencies here, one per line. + # Be sure to remove the '[]' above if you add dependencies + # to this list. diff --git a/tomcat/tasks/main.yml b/tomcat/tasks/main.yml new file mode 100644 index 00000000..d6e0947b --- /dev/null +++ b/tomcat/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- include: packages.yml +- include: nagios.yml diff --git a/tomcat-instance/tasks/nagios.yml b/tomcat/tasks/nagios.yml similarity index 93% rename from tomcat-instance/tasks/nagios.yml rename to tomcat/tasks/nagios.yml index a36b501b..01de5348 100644 --- a/tomcat-instance/tasks/nagios.yml +++ b/tomcat/tasks/nagios.yml @@ -27,6 +27,6 @@ - name: Copy Tomcat instance check template: - src: templates/check_tomcat_instance.sh.j2 + src: check_tomcat_instance.sh.j2 dest: /usr/local/lib/nagios/plugins/check_tomcat_instance.sh mode: "0755" diff --git a/tomcat-instance/tasks/tomcat.yml b/tomcat/tasks/packages.yml similarity index 93% rename from tomcat-instance/tasks/tomcat.yml rename to tomcat/tasks/packages.yml index 8233377c..908cbd7a 100644 --- a/tomcat-instance/tasks/tomcat.yml +++ b/tomcat/tasks/packages.yml @@ -18,7 +18,7 @@ - name: Copy systemd unit copy: - src: 'files/tomcat.service' + src: 'tomcat.service' dest: "/etc/systemd/user/tomcat.service" mode: "0755" notify: systemd reload diff --git a/tomcat-instance/templates/check_tomcat_instance.sh.j2 b/tomcat/templates/check_tomcat_instance.sh.j2 similarity index 100% rename from tomcat-instance/templates/check_tomcat_instance.sh.j2 rename to tomcat/templates/check_tomcat_instance.sh.j2