Skip to content
This repository was archived by the owner on Mar 14, 2023. It is now read-only.

Commit 59f5a53

Browse files
committed
Fix test.
Signed-off-by: Ben Kochie <superq@gmail.com>
1 parent b2f0453 commit 59f5a53

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

molecule/default/molecule.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,37 @@ platforms:
99
- name: bionic
1010
image: paulfantom/ubuntu-molecule:18.04
1111
privileged: true
12+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
1213
volumes:
1314
- /sys/fs/cgroup:/sys/fs/cgroup:ro
1415
- name: xenial
1516
image: paulfantom/ubuntu-molecule:16.04
1617
privileged: true
18+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
1719
volumes:
1820
- /sys/fs/cgroup:/sys/fs/cgroup:ro
1921
- name: stretch
2022
image: paulfantom/debian-molecule:9
2123
privileged: true
24+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
2225
volumes:
2326
- /sys/fs/cgroup:/sys/fs/cgroup:ro
2427
- name: jessie
2528
image: paulfantom/debian-molecule:8
2629
privileged: true
30+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
2731
volumes:
2832
- /sys/fs/cgroup:/sys/fs/cgroup:ro
2933
- name: centos7
3034
image: paulfantom/centos-molecule:7
3135
privileged: true
36+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
3237
volumes:
3338
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3439
- name: fedora
3540
image: paulfantom/fedora-molecule:27
3641
privileged: true
42+
docker_host: "${DOCKER_HOST:-unix://var/run/docker.sock}"
3743
volumes:
3844
- /sys/fs/cgroup:/sys/fs/cgroup:ro
3945
provisioner:

molecule/default/playbook.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
roles:
55
- ansible-mysqld-exporter
66
vars:
7+
mysqld_exporter_dsn: "root@(localhost:3306)/"
78
mysqld_exporter_web_listen_address: "127.0.0.1:9104"

molecule/default/prepare.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,26 @@
22
- name: Prepare
33
hosts: all
44
tasks:
5+
- name: Gather variables for each operating system
6+
debug:
7+
var: ansible_distribution_release
58
- name: Install mysqld server
69
package:
710
name: "{{ mysql_package }}"
811
state: present
912
- name: Start mysql server
1013
systemd:
1114
name: "{{ mysql_service }}"
15+
enabled: true
1216
state: started
1317
vars:
14-
mysql_package: "{{ 'mariadb' if (ansible_os_family | lower) == 'redhat' else 'mariadb-server' }}"
15-
mysql_service: mysqld
16-
18+
mysql_service_map:
19+
CentOS:
20+
Core: "mariadb"
21+
Debian:
22+
stretch: "mysqld"
23+
Fedora:
24+
Twenty Eight: "mariadb"
25+
Ubuntu:
26+
mysql_package: "mariadb-server"
27+
mysql_service: "{{ mysql_service_map[ansible_distribution][ansible_distribution_release] | default('mysql') }}"

0 commit comments

Comments
 (0)