Make inventory/service for service-specific things, including the
groups.yaml group definitions, and inventory/base for hostvars
related to the base system, including the list of hosts.
Move the exisitng host_vars into inventory/service, since most of
them are likely service-specific. Move group_vars/all.yaml into
base/group_vars as almost all of it is related to base things,
with the execption of the gerrit public key.
A followup patch will move host-specific values into equivilent
files in inventory/base.
This should let us override hostvars in gate jobs. It should also
allow us to do better file matchers - and to be able to organize
our playbooks move if we want to.
Depends-On: https://review.opendev.org/731583
Change-Id: Iddf57b5be47c2e9de16b83a1bc83bee25db995cf
We are copying system-config in parallel to a bunch of targets
and we're also creating and deleting applytest files. Instead,
do the apply test files outside of the dir that's going to
get synced in the puppet role.
While we're at it, copy don't link the openstack_project
module into /etc/puppet/modules, just to be sure.
Change-Id: I4bcd8ebd6da8395e77d673ac76f4c41568d810ec
This is not a variable describing the system-under-management
bridge.openstack.org - it's a variable that is always true for all
systems in the puppet group.
As a result, update the puppet apply test to figure out which directory
we should be copying modules _from_ - since the puppet4 tests will be
unhappy otherwise.
Change-Id: Iddee83944bd85f69acf4fcfde83dc70304386baf
The puppet playbooks were some of the first we wrote, so they're
slightly wonky.
Remove '---' lines that are completely unnecessary.
Fix indentation.
Move some variables that are the same everywhere into
ansible variables.
Put puppet related variables into the puppet group_vars.
Stop running puppet on localhost in the git playbook.
Change-Id: I2d2a4acccd3523f1931ebec5977771d5a310a0c7
Be explicity with our inventory file, to avoid ansible-playbook from
skipping hosts.
Change-Id: I29260bd97432a443e5989fa4a883e8e8d37307fd
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This is needed since the hiera configuration is in the ansible
role.
Have puppet append its output directly to our per-test output file.
Rename that file with a FAILED suffix for easy identification when
looking at the results in the published log directory.
Change-Id: Ie2a028b9e0179168d279bcf33de7f997cdfdbc8d
Depends-On: I0db01d128258f78e9b196354799a80774f6c6808
The script that is run by find on each apply test file has -e set,
yet, it attempts to save the exit code from puppet apply and keep
running even in error. Remove -e so that it does not immediately
exit and can continue as designed.
Change-Id: I1a24e80f42be8d028ecc3eb02df54b49f811fff4
Otherwise, there is a case where the results are not rendered properly
because the shell exits.
Change-Id: Ica05615cad4fcc15c9d941d16f74cb4f68bc5a99
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This makes it easier to tell which node definition is being evaluated
Because xargs -P doesn't do bash functions, some of the apply_test has
been moved into test_puppet_apply.sh. All the test snippets and test
output is being recorded in files in tools/opt, then catted for the
user.
Change-Id: I4fb77f93f9e9a7216b62634438a11d8d297bdefe
