Skip to content

Commit

Permalink
Fix debian and default ubuntu scenario
Browse files Browse the repository at this point in the history
  • Loading branch information
Ēriks Zviedrāns authored and Ēriks Zviedrāns committed Apr 25, 2019
1 parent 365f685 commit 33f5e4c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
4 changes: 4 additions & 0 deletions molecule/default-debian_stretch/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM {{ item.image }}

RUN apt-get update && apt-get install -y --no-install-recommends \
python-setuptools python-pip systemd systemd-sysv && apt-get clean
2 changes: 1 addition & 1 deletion molecule/default-debian_stretch/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ platforms:
- name: default-debian_stretch
image: debian:stretch
privileged: True
pre_build_image: True
command: /sbin/init
provisioner:
name: ansible
lint:
Expand Down
8 changes: 0 additions & 8 deletions molecule/default-debian_stretch/playbook.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
---
- name: Converge
hosts: all
gather_facts: false
pre_tasks:
- name: Install python2 for Ansible
raw: test -e /usr/bin/python || (apt -y update && apt install -y python-setuptools)
register: output
changed_when: output.stdout | length > 0
- name: Gathering Facts
setup:
roles:
- role: xymon-client
2 changes: 1 addition & 1 deletion molecule/default/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
hosts: all
gather_facts: false
pre_tasks:
- name: Install python2 for Ansible
- name: Install python2 for ansible
raw: test -e /usr/bin/python || (apt -y update && apt install -y python-software-properties)
register: output
changed_when: output.stdout | length > 0
Expand Down

0 comments on commit 33f5e4c

Please sign in to comment.