openstack
/
tripleo-ansible
Code Issues Proposed changes

Don't specify inventory in base molecule config file 

The host list gets merged by molecule, causing an unwanted "instance"
host in the inventory. Let's keep the inventory definition inside role
configs.

Closes-Bug: 1964595
Change-Id: Ida4b9e08c6cff6d140451df75b1807b89e6de073
(cherry picked from commit 77b56d10f1)
This commit is contained in:
Rafael Castillo 2022-03-11 11:05:34 -07:00 committed by Ronelle Landy
parent 1fbbf40615
commit e1f2542c64
15 changed files with 94 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.config/molecule/config.yml
View File

@ -27,12 +27,6 @@ provisioner:
defaults:
fact_caching: jsonfile
fact_caching_connection: /tmp/molecule/facts
inventory:
hosts:
all:
hosts:
instance:
ansible_host: localhost
log: true
env:
ANSIBLE_STDOUT_CALLBACK: yaml

7
tripleo_ansible/roles/tripleo_kernel/molecule/default/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/extra/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-adding/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-modify-existing-kernelargs/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-modify-idempotency-change/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-modify-idempotency-nochange/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-modify-integer/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-modify-remove/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-modify/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-nochange-remove/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-hugepages-nochange/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs-update/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

7
tripleo_ansible/roles/tripleo_kernel/molecule/kernelargs/molecule.yml
View File

@ -1,6 +1,13 @@
---
# inherits .config/molecule/config.yml
provisioner:
inventory:
hosts:
all:
hosts:
instance:
ansible_connection: local
ansible_host: localhost
playbooks:
prepare: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/prepare.yml"
cleanup: "${MOLECULE_SCENARIO_DIRECTORY}/../../resources/molecule/cleanup.yml"

6
zuul.d/layout.yaml
View File

@ -10,12 +10,12 @@
- tripleo-upgrades-wallaby-pipeline
check:
jobs:
- tripleo-ci-centos-8-content-provider: &provider_deps_irrelevant
- tripleo-ci-centos-8-content-provider:
dependencies:
- openstack-tox-linters
irrelevant-files:
irrelevant-files: &provider_deps_irrelevant
- ^tox.ini$
- tripleo-ci-centos-9-content-provider: *provider_deps_irrelevant
- tripleo-ci-centos-9-content-provider
- openstack-tox-linters: &tripleo-linters
nodeset: centos-8-stream
- openstack-tox-docs: &tripleo-docs