Skip to content

Commit e8f66c8

Browse files
author
Olivier Locard
authored
Merge pull request Deveryware#12 from kurotoshiro/feature-AddMoleculeSupport
Feature add Molecule support
2 parents fb06c5f + af8bb4f commit e8f66c8

File tree

18 files changed

+346
-383
lines changed

18 files changed

+346
-383
lines changed

.kitchen.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.yamllint

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
extends: default
2+
3+
rules:
4+
braces:
5+
max-spaces-inside: 1
6+
level: error
7+
brackets:
8+
max-spaces-inside: 1
9+
level: error
10+
line-length: disable
11+
truthy: disable

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ Sergei Antipov
3030
Stuart Williams
3131
Travis Truman
3232
Tuyen Dinh
33+
Yoann LE TOUCHE

Gemfile

Lines changed: 0 additions & 6 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 53 deletions
This file was deleted.

defaults/main.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ haproxy_defaults:
3838
facility: local1
3939
level: notice
4040
timeout:
41-
- param: 'connect'
42-
value: '5000ms'
43-
- param: 'client'
44-
value: '50000ms'
45-
- param: 'server'
46-
value: '50000ms'
41+
- param: 'connect'
42+
value: '5000ms'
43+
- param: 'client'
44+
value: '50000ms'
45+
- param: 'server'
46+
value: '50000ms'
4747
options:
4848
- httpclose
4949
- forwardfor except 127.0.0.0/8
@@ -52,20 +52,20 @@ haproxy_defaults:
5252
- httplog
5353
- dontlognull
5454
errorfile:
55-
- code: 400
56-
file: /etc/haproxy/errors/400.http
57-
- code: 403
58-
file: /etc/haproxy/errors/403.http
59-
- code: 408
60-
file: /etc/haproxy/errors/408.http
61-
- code: 500
62-
file: /etc/haproxy/errors/500.http
63-
- code: 502
64-
file: /etc/haproxy/errors/502.http
65-
- code: 503
66-
file: /etc/haproxy/errors/503.http
67-
- code: 504
68-
file: /etc/haproxy/errors/504.http
55+
- code: 400
56+
file: /etc/haproxy/errors/400.http
57+
- code: 403
58+
file: /etc/haproxy/errors/403.http
59+
- code: 408
60+
file: /etc/haproxy/errors/408.http
61+
- code: 500
62+
file: /etc/haproxy/errors/500.http
63+
- code: 502
64+
file: /etc/haproxy/errors/502.http
65+
- code: 503
66+
file: /etc/haproxy/errors/503.http
67+
- code: 504
68+
file: /etc/haproxy/errors/504.http
6969

7070
haproxy_resolvers: []
7171
haproxy_backends: []

meta/main.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ galaxy_info:
66
license: Apache v2
77
min_ansible_version: 2.2
88
platforms:
9-
- name: Ubuntu
10-
versions:
11-
- precise
12-
- trusty
13-
- name: CentOS
14-
- name: Debian
15-
versions:
16-
- jessie
17-
- name: Alpine
18-
categories:
19-
- networking
20-
- system
21-
- web
9+
- name: Ubuntu
10+
versions:
11+
- precise
12+
- trusty
13+
- name: CentOS
14+
- name: Debian
15+
versions:
16+
- jessie
17+
- name: Alpine
18+
galaxy_tags:
19+
- networking
20+
- system
21+
- web
2222
dependencies: []

molecule/default/Dockerfile.j2

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Molecule managed
2+
3+
{% if item.registry is defined %}
4+
FROM {{ item.registry.url }}/{{ item.image }}
5+
{% else %}
6+
FROM {{ item.image }}
7+
{% endif %}
8+
9+
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
10+
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
11+
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; \
12+
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
13+
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
14+
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

molecule/default/INSTALL.rst

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
*******
2+
Docker driver installation guide
3+
*******
4+
5+
Requirements
6+
============
7+
8+
* Docker Engine
9+
10+
Install
11+
=======
12+
13+
Please refer to the `Virtual environment`_ documentation for installation best
14+
practices. If not using a virtual environment, please consider passing the
15+
widely recommended `'--user' flag`_ when invoking ``pip``.
16+
17+
.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
18+
.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
19+
20+
.. code-block:: bash
21+
22+
$ pip install 'molecule[docker]'

0 commit comments

Comments
 (0)