Browse Source

remove provisioning information from molecule.yml

because they are now expected to be in the host variables and not in
the platforms variable of molecule.yml
keep-around/ee474eedaff5e7fc1333586f237f0eab65b2442a
singuliere 2 years ago
parent
commit
ee474eedaf
No known key found for this signature in database GPG Key ID: 900857755EF189C2
  1. 2
      inventory/host_vars/cloud-host/provision.yml
  2. 5
      molecule/api/molecule.yml
  3. 1
      molecule/authorized_keys/molecule.yml
  4. 4
      molecule/backup/molecule.yml
  5. 4
      molecule/bind/molecule.yml
  6. 3
      molecule/chat/molecule.yml
  7. 7
      molecule/cloud/molecule.yml
  8. 7
      molecule/enough/molecule.yml
  9. 3
      molecule/firewall/molecule.yml
  10. 4
      molecule/forum/molecule.yml
  11. 5
      molecule/gitlab/molecule.yml
  12. 4
      molecule/icinga/molecule.yml
  13. 4
      molecule/letsencrypt-nginx/molecule.yml
  14. 2
      molecule/letsencrypt/molecule.yml
  15. 1
      molecule/misc/molecule.yml
  16. 3
      molecule/packages/molecule.yml
  17. 3
      molecule/postfix/molecule.yml
  18. 20
      molecule/preprod/molecule.yml
  19. 4
      molecule/wazuh/molecule.yml
  20. 4
      molecule/weblate/molecule.yml
  21. 3
      molecule/website/molecule.yml
  22. 7
      molecule/wereport/molecule.yml

2
inventory/host_vars/cloud-host/provision.yml

@ -1,4 +1,4 @@
---
openstack_volumes:
- name: cloud-volume
size: 100
size: 10

5
molecule/api/molecule.yml

@ -5,17 +5,12 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: api-host
flavor: "s1-2"
groups:
- gitlab
- name: packages-host
flavor: "s1-4"
- name: icinga-host
flavor: "s1-2"
- name: gitlab-host
flavor: "s1-4"
groups:
- gitlab
provisioner:

1
molecule/authorized_keys/molecule.yml

@ -5,7 +5,6 @@ lint:
name: yamllint
platforms:
- name: authorized-keys-host
flavor: "s1-2"
provisioner:
name: ansible
lint:

4
molecule/backup/molecule.yml

@ -5,15 +5,13 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: weblate-host
flavor: "s1-2"
groups:
- pets
provisioner:
name: ansible
options:
i: ../../inventory/firewall.yml,../../inventory/02-all.yml
i: ../../inventory/firewall.yml
limit: bind-host,weblate-host,localhost
lint:
name: ansible-lint

4
molecule/bind/molecule.yml

@ -5,15 +5,11 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: bind-client-host
flavor: "s1-2"
groups:
- firewall_ssh_server_group
- name: external-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
provisioner:
name: ansible
options:

3
molecule/chat/molecule.yml

@ -5,11 +5,8 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: chat-host
flavor: "s1-2"
provisioner:
name: ansible
options:

7
molecule/cloud/molecule.yml

@ -5,21 +5,14 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: cloud-host
flavor: "s1-2"
# remove when https://github.com/ansible/molecule/issues/1650 is resolved
groups:
- enough
- firewall_ssh_server_group
- firewall_web_server_group
volumes:
- name: cloud-volume
size: 10
provisioner:
name: ansible
options:

7
molecule/enough/molecule.yml

@ -5,20 +5,13 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: cloud-host
flavor: "s1-2"
groups:
- enough
- firewall_ssh_server_group
- firewall_web_server_group
volumes:
- name: cloud-volume
size: 10
provisioner:
name: ansible
options:

3
molecule/firewall/molecule.yml

@ -5,7 +5,6 @@ lint:
name: yamllint
platforms:
- name: server-host
flavor: "s1-2"
groups:
- firewall_dns_server_group
- firewall_postfix_server_group
@ -14,7 +13,6 @@ platforms:
- firewall_ssh_server_group
- firewall_icmp_server_group
- name: client-host
flavor: "s1-2"
groups:
- firewall_dns_client_group
- firewall_postfix_client_group
@ -23,7 +21,6 @@ platforms:
- firewall_ssh_client_group
- firewall_icmp_client_group
- name: gitlab-host
flavor: "s1-2"
provisioner:
name: ansible
lint:

4
molecule/forum/molecule.yml

@ -5,13 +5,9 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: forum-host
flavor: "s1-4"
provisioner:
name: ansible
options:

5
molecule/gitlab/molecule.yml

@ -5,15 +5,10 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: runner-host
flavor: "s1-2"
- name: gitlab-host
flavor: "s1-4"
groups:
- gitlab
provisioner:

4
molecule/icinga/molecule.yml

@ -5,15 +5,11 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: monitoring-client-host
flavor: "s1-2"
groups:
- firewall_ssh_server_group
- name: monitoring-client2-host
flavor: "s1-2"
groups:
- firewall_ssh_server_group
provisioner:

4
molecule/letsencrypt-nginx/molecule.yml

@ -5,21 +5,17 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
groups:
- firewall_web_server_group
- name: nginx-host
flavor: "s1-2"
groups:
- firewall_ssh_server_group
- firewall_web_server_group
- name: proxy-host
flavor: "s1-2"
groups:
- firewall_ssh_server_group
- firewall_web_server_group
- name: client-host
flavor: "s1-2"
groups:
- firewall_ssh_server_group
provisioner:

2
molecule/letsencrypt/molecule.yml

@ -5,9 +5,7 @@ lint:
name: yamllint
platforms:
- name: certs-host
flavor: "s1-2"
- name: nocerts-host
flavor: "s1-2"
provisioner:
name: ansible
lint:

1
molecule/misc/molecule.yml

@ -5,7 +5,6 @@ lint:
name: yamllint
platforms:
- name: debian-host
flavor: "s1-2"
provisioner:
name: ansible
lint:

3
molecule/packages/molecule.yml

@ -5,11 +5,8 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: packages-host
flavor: "s1-4"
provisioner:
name: ansible
options:

3
molecule/postfix/molecule.yml

@ -5,11 +5,8 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
provisioner:
name: ansible
options:

20
molecule/preprod/molecule.yml

@ -5,55 +5,35 @@ lint:
name: yamllint
platforms:
- name: api-host
flavor: "s1-2"
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
# remove when https://github.com/ansible/molecule/issues/1650 is resolved
groups:
- wazuh_agent
- name: icinga-host
flavor: "s1-2"
- name: wazuh-host
flavor: "s1-2"
- name: weblate-host
flavor: "s1-4"
# remove when https://github.com/ansible/molecule/issues/1650 is resolved
groups:
- pets
- name: gitlab-host
flavor: "s1-4"
- name: runner-host
flavor: "s1-4"
- name: packages-host
flavor: "s1-4"
- name: website-host
flavor: "s1-2"
- name: chat-host
flavor: "s1-2"
- name: cloud-host
flavor: "s1-2"
# remove when https://github.com/ansible/molecule/issues/1650 is resolved
groups:
- enough
- firewall_ssh_server_group
- firewall_web_server_group
volumes:
- name: cloud-volume
size: 100
- name: wereport-host
flavor: "s1-2"
# remove when https://github.com/ansible/molecule/issues/1650 is resolved
groups:
- enough
- firewall_ssh_server_group
- firewall_web_server_group
volumes:
- name: wereport-volume
size: 10
- name: forum-host
flavor: "s1-4"
provisioner:
name: ansible
options:

4
molecule/wazuh/molecule.yml

@ -5,15 +5,11 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
groups:
- wazuh_agent
- name: icinga-host
flavor: "s1-2"
- name: wazuh-host
flavor: "s1-2"
provisioner:
name: ansible
options:

4
molecule/weblate/molecule.yml

@ -5,13 +5,9 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: weblate-host
flavor: "s1-4"
provisioner:
name: ansible
options:

3
molecule/website/molecule.yml

@ -5,11 +5,8 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: website-host
flavor: "s1-2"
provisioner:
name: ansible
options:

7
molecule/wereport/molecule.yml

@ -5,21 +5,14 @@ lint:
name: yamllint
platforms:
- name: bind-host
flavor: "s1-2"
- name: postfix-host
flavor: "s1-2"
- name: icinga-host
flavor: "s1-2"
- name: wereport-host
flavor: "s1-2"
# remove when https://github.com/ansible/molecule/issues/1650 is resolved
groups:
- enough
- firewall_ssh_server_group
- firewall_web_server_group
volumes:
- name: wereport-volume
size: 10
provisioner:
name: ansible
options:

Loading…
Cancel
Save