Skip to content

Commit

Permalink
Simplification: remove weird ignore_docker flag.
Browse files Browse the repository at this point in the history
  • Loading branch information
robertdebock committed Mar 11, 2019
1 parent 04ee5d9 commit e129762
Show file tree
Hide file tree
Showing 21 changed files with 44 additions and 173 deletions.
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ This example is taken from `molecule/default/playbook.yml`:
- robertdebock.buildtools
- robertdebock.python_pip
- robertdebock.httpd

```
Also see a [full explanation and example](https://robertdebock.nl/how-to-use-these-roles.html) on how to use these roles.
Expand All @@ -68,12 +67,6 @@ 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
5 changes: 0 additions & 5 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,3 @@ 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 @@ -9,4 +9,4 @@
name: "{{ httpd_service }}"
state: restarted
when:
- ansible_virtualization_type != "docker" or httpd_ignore_docker
- ansible_virtualization_type != "docker"
11 changes: 2 additions & 9 deletions molecule/alpine-edge/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,17 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-alpine-edge
image: alpine:edge
command: sh -c "while true ; do sleep 1 ; done"
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: alpine-edge
11 changes: 2 additions & 9 deletions molecule/alpine-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,17 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-alpine-latest
image: alpine:latest
command: sh -c "while true ; do sleep 1 ; done"
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: alpine-latest
11 changes: 2 additions & 9 deletions molecule/archlinux/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-archlinux
image: archlinux/base
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: archlinux
11 changes: 2 additions & 9 deletions molecule/centos-6/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-centos-6
image: centos:6
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: centos-6
11 changes: 2 additions & 9 deletions molecule/centos-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-centos-latest
image: centos:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: centos-latest
11 changes: 2 additions & 9 deletions molecule/debian-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-debian-latest
image: debian:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: debian-latest
11 changes: 2 additions & 9 deletions molecule/debian-stable/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-debian-stable
image: debian:stable
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: debian-stable
11 changes: 2 additions & 9 deletions molecule/debian-unstable/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-debian-unstable
image: debian:unstable
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: debian-unstable
14 changes: 2 additions & 12 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-alpine-edge
image: alpine:edge
Expand Down Expand Up @@ -42,17 +42,7 @@ platforms:
image: ubuntu:latest
provisioner:
name: ansible
inventory:
host_vars:
httpd-fedora-rawhide:
ansible_python_interpreter: /usr/bin/python3
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: default
23 changes: 10 additions & 13 deletions molecule/ec2/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: ec2
lint:
name: yamllint
driver:
name: ec2
platforms:
# - name: rhel-7
# image: ami-c86c3f23
# instance_type: t2.micro
# vpc_subnet_id: subnet-0e688067
# - name: sles-15
# image: ami-0a1886cf45f944eb1
# instance_type: t2.micro
# vpc_subnet_id: subnet-0e688067
- name: httpd-rhel-7
image: ami-c86c3f23
instance_type: t2.micro
vpc_subnet_id: subnet-0e688067
- name: httpd-sles-15
image: ami-0a1886cf45f944eb1
instance_type: t2.micro
vpc_subnet_id: subnet-0e688067
- name: httpd-ubuntu-18.04
image: ami-0bdf93799014acdc4
instance_type: t2.micro
Expand All @@ -36,9 +36,6 @@ provisioner:
name: ansible
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
inventory:
host_vars:
httpd-ubuntu-18.04:
Expand Down
11 changes: 2 additions & 9 deletions molecule/fedora-latest/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-fedora-latest
image: fedora:latest
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: fedora-latest
14 changes: 2 additions & 12 deletions molecule/fedora-rawhide/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,18 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-fedora-rawhide
image: fedora:rawhide
registry:
url: registry.fedoraproject.org
provisioner:
name: ansible
inventory:
host_vars:
httpd-fedora-rawhide:
ansible_python_interpreter: /usr/bin/python3
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: fedora-rawhide
11 changes: 2 additions & 9 deletions molecule/opensuse-leap/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,16 @@ dependency:
name: galaxy
options:
role-file: requirements.yml
driver:
name: docker
lint:
name: yamllint
driver:
name: docker
platforms:
- name: httpd-opensuse-leap
image: opensuse:leap
provisioner:
name: ansible
inventory:
group_vars:
all:
httpd_ignore_docker: no
lint:
name: ansible-lint
config_options:
defaults:
callback_plugins: /usr/lib/python2.7/site-packages/ara/plugins/callbacks
scenario:
name: opensuse-leap
Loading

0 comments on commit e129762

Please sign in to comment.