Browse Source

group_vars and host_vars must be in the inventory directory

keep-around/441bb62798e1d13de9e6fa259e2b013ebcc09baf
Loïc Dachary 4 years ago
parent
commit
58511d097f
  1. 2
      docs/gitlab.rst
  2. 2
      docs/monitoring_howto.rst
  3. 0
      inventory/group_vars/all/infrastructure.yml
  4. 0
      inventory/host_vars/icinga-host/monitoring.yml
  5. 0
      inventory/host_vars/weblate-host/weblate.yml
  6. 4
      molecule/authorized_keys/molecule.yml
  7. 4
      molecule/backup/molecule.yml
  8. 4
      molecule/bind/molecule.yml
  9. 4
      molecule/gitlab/molecule.yml
  10. 4
      molecule/icinga/molecule.yml
  11. 4
      molecule/infrastructure/molecule.yml
  12. 4
      molecule/postfix/molecule.yml
  13. 2
      molecule/preprod/molecule.yml
  14. 4
      molecule/sexy-debian/molecule.yml
  15. 4
      molecule/weblate/molecule.yml

2
docs/gitlab.rst

@ -3,7 +3,7 @@ GitLab
`lab.securedrop.club <http://lab.securedrop.club/main/securedrop-club/tree/master/molecule/gitlab/roles/gitlab>`_ is installed `with docker <https://hub.docker.com/r/sameersbn/gitlab/>`_ with the `https-portal letsencrypt reverse proxy <https://github.com/WeblateOrg/docker/blob/master/docker-compose-https.yml>`_.
The configuration variables are set in `host_vars/gitlab-host.yml` at
The configuration variables are set in `inventory/host_vars/gitlab-host.yml` at
the root of the repository. It can be copied from
`molecule/gitlab/roles/gitlab/defaults/main.yml`.

2
docs/monitoring_howto.rst

@ -16,7 +16,7 @@ Monitoring deployment
Monitoring is deployed as long as the playbook
`molecule/icinga/icinga-playbook.yml` has been imported. The Icinga2 master
is `icinga-host`. See also `host_vars/icinga-host/monitoring.yml` for
is `icinga-host`. See also `inventor/host_vars/icinga-host/monitoring.yml` for
specific deployment attributes: icingaweb credentials, https, virtualhost fqdn.
Each host is monitored by default.

0
group_vars/all/infrastructure.yml → inventory/group_vars/all/infrastructure.yml

0
host_vars/icinga-host/monitoring.yml → inventory/host_vars/icinga-host/monitoring.yml

0
host_vars/weblate-host/weblate.yml → inventory/host_vars/weblate-host/weblate.yml

4
molecule/authorized_keys/molecule.yml

@ -17,8 +17,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: authorized_keys
test_sequence:

4
molecule/backup/molecule.yml

@ -15,8 +15,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: backup
test_sequence:

4
molecule/bind/molecule.yml

@ -21,8 +21,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: bind
test_sequence:

4
molecule/gitlab/molecule.yml

@ -24,8 +24,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: gitlab
test_sequence:

4
molecule/icinga/molecule.yml

@ -19,8 +19,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: icinga
test_sequence:

4
molecule/infrastructure/molecule.yml

@ -15,8 +15,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: infrastructure
test_sequence:

4
molecule/postfix/molecule.yml

@ -19,8 +19,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: postfix
test_sequence:

2
molecule/preprod/molecule.yml

@ -24,7 +24,7 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
group_vars: ../../../inventory/group_vars
host_vars: ../host_vars
scenario:
name: preprod

4
molecule/sexy-debian/molecule.yml

@ -15,8 +15,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: sexy-debian
test_sequence:

4
molecule/weblate/molecule.yml

@ -22,8 +22,8 @@ provisioner:
inventory:
links:
# Path is relative to .molecule folder
group_vars: ../../../group_vars
host_vars: ../../../host_vars
group_vars: ../../../inventory/group_vars
host_vars: ../../../inventory/host_vars
scenario:
name: weblate
test_sequence:

Loading…
Cancel
Save