Skip to content

Commit

Permalink
Fix readme link.
Browse files Browse the repository at this point in the history
  • Loading branch information
robertdebock committed Nov 22, 2018
1 parent b493efc commit 974d630
Show file tree
Hide file tree
Showing 20 changed files with 80 additions and 3 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ httpd_ssl_port: 443
# To update all packages installed by this roles, set `httpd_package_state` to `latest`.
httpd_package_state: present
# Some Docker containers do not allow managing services, rebooting and writing
# to some locations in /etc. The role skips tasks that will typically fail in
# Docker. With this parameter you can tell the role to -not- skip these tasks.
httpd_ignore_docker: yes
```

Requirements
Expand Down Expand Up @@ -117,9 +122,12 @@ To test this role locally please use [Molecule](https://github.com/metacloud/mol
pip install molecule
molecule test
```

To test on Amazon EC2, configure [~/.aws/credentials](https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/credentials.html) and `export AWS_REGION=eu-central-1` before running `molecule test --scenario-name ec2`.

There are many specific scenarios available, please have a look in the `molecule/` directory.

Run the [ansible-galaxy[(https://github.com/ansible/galaxy-lint-rules) and [my](https://github.com/robertdebock/ansible-lint-rules) lint rules if you want your change to be merges:
Run the [ansible-galaxy](https://github.com/ansible/galaxy-lint-rules) and [my](https://github.com/robertdebock/ansible-lint-rules) lint rules if you want your change to be merges:
```
ansible-lint -r /path/to/galaxy-lint-rules/rules .
ansible-lint -r /path/to/ansible-lint-rules/rules .
Expand Down
5 changes: 5 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ httpd_ssl_port: 443

# To update all packages installed by this roles, set `httpd_package_state` to `latest`.
httpd_package_state: present

# Some Docker containers do not allow managing services, rebooting and writing
# to some locations in /etc. The role skips tasks that will typically fail in
# Docker. With this parameter you can tell the role to -not- skip these tasks.
httpd_ignore_docker: yes
2 changes: 1 addition & 1 deletion handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
name: "{{ httpd_service }}"
state: restarted
when:
- ansible_virtualization_type != "docker"
- ansible_virtualization_type != "docker" or httpd_ignore_docker
4 changes: 4 additions & 0 deletions molecule/alpine-edge/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ platforms:
command: sh -c "while true ; do sleep 1 ; done"
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/alpine-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ platforms:
command: sh -c "while true ; do sleep 1 ; done"
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/archlinux/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: base/archlinux
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/centos-6/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: centos:6
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/centos-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: centos:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/debian-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: debian:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/debian-stable/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: debian:stable
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/debian-unstable/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: debian:unstable
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ platforms:
image: ubuntu:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
Expand Down
4 changes: 4 additions & 0 deletions molecule/fedora-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: fedora:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/fedora-rawhide/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ platforms:
url: registry.fedoraproject.org
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/opensuse-leap/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: opensuse:leap
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/opensuse-tumbleweed/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: opensuse:tumbleweed
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/ubuntu-artful/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: ubuntu:artful
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/ubuntu-devel/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: ubuntu:devel
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
4 changes: 4 additions & 0 deletions molecule/ubuntu-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ platforms:
image: ubuntu:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
scenario:
Expand Down
2 changes: 1 addition & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
state: started
enabled: yes
when:
- ansible_virtualization_type != "docker"
- ansible_virtualization_type != "docker" or httpd_ignore_docker

0 comments on commit 974d630

Please sign in to comment.