Skip to content

Commit

Permalink
Merge pull request #62 from idealista/features/#61
Browse files Browse the repository at this point in the history
[#61] Update to molecule 3.x
  • Loading branch information
dortegau authored May 11, 2020
2 parents b464a73 + ceb85a6 commit a96e7e8
Show file tree
Hide file tree
Showing 55 changed files with 765 additions and 887 deletions.
8 changes: 8 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
exclude_paths:
- ./molecule
parseable: true
skip_list:
- '204'
- '503'
use_default_rules: true
verbosity: 1
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ tests/__pycache__
tests/roles
*.iml
.idea/
Pipfile
Pipfile.lock

18 changes: 6 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
---
language: python
python: "2.7.13"
sudo: required

env:
- ansible_version: 2.4.0.0
- ansible_version: 2.5.0.0
- ansible_version: 2.6.2.0

language: python
python: "3.7"
os: linux
services:
- docker

install:
- pip install ansible==${ansible_version}
- pip install -r test-requirements.txt
- pip install pipenv
- pipenv sync
script:
- molecule test --all
- pipenv run molecule test --all

notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
2 changes: 2 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---

extends: default

ignore: |
Expand Down
17 changes: 17 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]

[packages]
ansible = "==2.8.6"
molecule = "==3.0.4"
docker = "==4.1.0"
jmespath = "==0.9.4"
lxml = "==4.5.0"
ansible-lint = "==4.2.0"

[requires]
python_version = "3"
542 changes: 542 additions & 0 deletions Pipfile.lock

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
![Logo](https://raw.githubusercontent.com/idealista/tomcat-role/master/logo.gif)

[![Build Status](https://travis-ci.org/idealista/tomcat-role.svg?branch=master)](https://travis-ci.org/idealista/tomcat-role)
[![Ansible Galaxy](https://img.shields.io/badge/galaxy-idealista.tomcat__role-B62682.svg)](https://galaxy.ansible.com/idealista/tomcat_role)

# Tomcat Ansible role

This ansible role installs a Tomcat server in a debian environment.
Expand All @@ -26,6 +28,7 @@ For compatible Ansible versions check [.travis.yml](.travis.yml).
Inventory destination should be a Debian environment.

For testing purposes, [Molecule](https://molecule.readthedocs.io/) with Docker as driver and [Goss](http://goss.rocks) as verifier
This role needs a system with java previously installed. Its really recommended the use of idealista's java role for that purpose: [idealista.java-role](https://github.com/idealista/java_role)

### Installing

Expand Down Expand Up @@ -69,7 +72,8 @@ Look to the defaults properties file to see the possible configuration propertie
### Install dependencies

```sh
pipenv install
pipenv sync
pipenv shell
```

For more information read the [pipenv docs](https://docs.pipenv.org/).
Expand All @@ -84,11 +88,9 @@ See molecule/molecule.yml to check possible testing platforms.

## Works With

![Ansible](https://img.shields.io/badge/ansible-2.4.0.0-green.svg)
![Ansible](https://img.shields.io/badge/ansible-2.5.0.0-green.svg)
![Ansible](https://img.shields.io/badge/ansible-2.6.2.0-green.svg)
![Molecule](https://img.shields.io/badge/molecule-2.10.0-green.svg)
![Goss](https://img.shields.io/badge/goss-0.3.5-green.svg)
![Ansible](https://img.shields.io/badge/ansible-2.8.6-green.svg)
![Molecule](https://img.shields.io/badge/molecule-3.0.4-green.svg)
![Goss](https://img.shields.io/badge/goss-0.3-11-green.svg)

## Versioning

Expand Down
5 changes: 3 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
---

## General

tomcat_version: 8.5.31
tomcat_version: 9.0.34

## Service options

Expand All @@ -10,7 +11,7 @@ tomcat_user: tomcat
tomcat_group: tomcat

# start on boot
tomcat_service_enabled: yes
tomcat_service_enabled: true
# current state: started, stopped
tomcat_service_state: started

Expand Down
3 changes: 2 additions & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
galaxy_info:
company: Idealista S.A.U.
description: Tomcat role
min_ansible_version: 2.4.0.0
min_ansible_version: 2.8
license: Apache 2.0
author: idealista
platforms:
- name: Debian
versions:
Expand Down
9 changes: 0 additions & 9 deletions molecule/agent/Dockerfile.j2

This file was deleted.

16 changes: 0 additions & 16 deletions molecule/agent/INSTALL.rst

This file was deleted.

60 changes: 0 additions & 60 deletions molecule/agent/create.yml

This file was deleted.

27 changes: 0 additions & 27 deletions molecule/agent/destroy.yml

This file was deleted.

20 changes: 0 additions & 20 deletions molecule/agent/group_vars/tomcat/main.yml

This file was deleted.

31 changes: 0 additions & 31 deletions molecule/agent/molecule.yml

This file was deleted.

13 changes: 0 additions & 13 deletions molecule/agent/playbook.yml

This file was deleted.

5 changes: 0 additions & 5 deletions molecule/agent/prepare.yml

This file was deleted.

5 changes: 0 additions & 5 deletions molecule/agent/requirements.yml

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion molecule/agent/tests/dumpall.j2

This file was deleted.

50 changes: 0 additions & 50 deletions molecule/agent/tests/test_agent.yml

This file was deleted.

Loading

0 comments on commit a96e7e8

Please sign in to comment.