Skip to content

Commit 9a3da07

Browse files
committed
[skip ci] cleanup role
1 parent 4d81148 commit 9a3da07

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

molecule/default/molecule.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,25 @@ dependency:
33
name: galaxy
44
options:
55
role-file: requirements.yml
6-
roles-path: ../community
6+
roles-path: ${MOLECULE_PROJECT_DIRECTORY}/../community
77
driver:
88
name: vagrant
99
provider:
1010
name: virtualbox
11-
lint: yamllint . && flake8 && ansible-lint --exclude=meta,.cache
11+
lint: |
12+
set -e
13+
yamllint .
14+
flake8
15+
ANSIBLE_ROLES_PATH=${MOLECULE_PROJECT_DIRECTORY}/../community ANSIBLE_COLLECTIONS_PATH=${MOLECULE_PROJECT_DIRECTORY}/../community-collections ansible-lint
1216
platforms:
1317
- name: Fedora-Molecule-libvirt-host
14-
box: tcharl/fedora-33-cgroupv1
18+
box: fedora/34-cloud-base
1519
provider_options:
1620
cpus: 4
1721
memory: 8092
1822
provider_raw_config_args:
1923
- "customize ['modifyvm', :id, '--nested-hw-virt', 'on']"
20-
- "customize ['storagectl', :id, '--name', 'IDE Controller', '--hostiocache', 'on']"
24+
- "customize ['storagectl', :id, '--name', 'IDE', '--hostiocache', 'on']"
2125
provider_override_args:
2226
- "persistent_storage.enabled = true"
2327
- "persistent_storage.location = 'molecule-libvirt-host.vdi'"
@@ -27,7 +31,7 @@ platforms:
2731
provisioner:
2832
name: ansible
2933
env:
30-
ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}:../../../community
34+
ANSIBLE_ROLES_PATH: ${MOLECULE_PROJECT_DIRECTORY}/../community:${ANSIBLE_ROLES_PATH}:${MOLECULE_PROJECT_DIRECTORY}/..
3135
verifier:
3236
name: testinfra
3337
env:
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)