Commit Graph

16 Commits

Author SHA1 Message Date
Clark Boylan
b32d0b880c Revert "Install older setuptools in puppet apply jobs"
This reverts commit be802b319a.

A 50.1.0 release of setuptools has been made which reverts the breaking
behavior.

Change-Id: Ic32afc1466556eed9aaf3869974d85d5f779375f
2020-09-03 08:57:45 -07:00
Clark Boylan
be802b319a Install older setuptools in puppet apply jobs
We create a virtualenv to install ansible in which then runs puppet for
us in our puppet apply jobs. This is pulling in setuptools 50 which then
fails due to the problems setuptools 50 has with older pythons. Address
this by pinning back to setuptools <50.

Change-Id: I02ea466319f7cd90f73972bf5a99876d14823ac1
2020-09-01 13:59:21 -07:00
Sorin Sbarnea
b6311b5498 Switch prep-apply.sh to use python3
As part of py2 deprecation, we need to obliterate its use before
being able to drop it.

Change-Id: I35101a53265705513feaf7278e48c02a92a0c3e5
2020-06-15 14:43:25 -05:00
Monty Taylor
83ced7f6e6 Split inventory into multiple dirs and move hostvars
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
2020-06-04 07:44:36 -05:00
Monty Taylor
00f30529e3 Make applytest files outside of system-config
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
2020-04-19 10:57:22 -05:00
Ian Wienand
d5b321b074 Handle moved puppet repos
As per [1], it seems puppet has "cleaned up" most of the packages we
are using to install.

Install the puppet-agent packages directly as puppet's archive location
is not a valid repo. With puppet 4 at least these packages should bundle
everything we need including ruby.

[1] https://groups.google.com/forum/#!msg/puppet-users/cCsGWKunBe4/OdG0T7LeDAAJ

Depends-On: https://review.opendev.org/659384
Depends-On: https://review.opendev.org/659395
Change-Id: Ie9e2b79b42f397bddd960ccdc303b536155ce123
2019-05-15 16:03:07 -07:00
Monty Taylor
c6d129a108 Update some paths for opendev
There's a bunch in here. This is mostly big-ticket things and test
fixes. Also, change the README to rst - because why is it markdown?

Depends-On: https://review.opendev.org/654005
Change-Id: I21e5017011e1111b4d7a9e4bf0ea6b10f5dd8c1b
2019-04-20 09:31:14 -07:00
Ian Wienand
bdf8cd90f7 Replace openstack.org git:// URLs with https://
This is a mechanically generated change to replace openstack.org
git:// URLs with https:// equivalents.

This is in aid of a planned future move of the git hosting
infrastructure to a self-hosted instance of gitea (https://gitea.io),
which does not support the git wire protocol at this stage.

This update should result in no functional change.

For more information see the thread at

 http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html

Change-Id: I6c126f7e724249741403a87733f546c1642f7f25
2019-03-25 09:40:52 -07:00
Colleen Murphy
f10f116f60 Fix puppet config for puppet 4
There are some assumptions made about the puppet config paths that
aren't applicable for puppet 4. Configuration, including modules,
belongs under /etc/puppetlabs. It's also no longer necessary to fix up
the templatedir or server configs in puppet.conf.

Change-Id: I3b544b6ce4a96a7a2478522a78402f77ff86a5a5
2018-04-20 14:24:17 +02:00
Paul Belanger
7797b5927a
Set SETUP_PIP=false for tools/prep-apply.sh
Because we are running tests in the gate, we can skip downloading pip,
as our images have already been setup to use the latest version.

Change-Id: I3d235334e0457b70bb69a8fe4b475e69d84c3407
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2017-10-15 21:31:08 -04:00
Paul Belanger
dc0cf8acbb Fix puppet-apply tests
Puppet is now throwing an error about this for centos-7 unit tests.

Add empty SSH key for krotscheck.

We also need to make sure puppet has been properly installed, this is
because we have recently removed puppet from our diskimages.

Change-Id: I8bcaddd045be3f81de5c2481e0de6a8526c97a91
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2017-05-01 16:35:03 +00:00
Colleen Murphy
2a20fbb52b Fix puppet-apply test for Debian Jessie
The version of puppet 3.x in Debian Jessie is 3.7.2, which seems to be
unable to read the modulepath setting from environment.conf. Since we
only have the one environment, the quick fix is to link the module into
the standard module path.

Change-Id: I6f4fa87fa4941c29abf37c277f5ce895a51945bc
2017-03-26 00:32:19 +01:00
K Jonathan Harker
74a92c4645 Fix logstash-filters test
In order to run the script directly in the test, the script needs to
have the executable bit set. Currently, the test is failing with a
"Permission denied" error when attempting to run the script.

We also need to run install_modules.sh in the logstash-filters test, so
move that invocation to the shared prep-apply.sh script.

The vcsrepo puppet define doesn't understand revisions of the form
"refs/zuul/foo", so instead parse the HEAD sha and pass that to vcsrepo.

Finally, we need to ensure that $elasticsearch_nodes is populated with
an array, otherwise the function @elasticsearch_nodes.map in the
output.conf template will fail.

Change-Id: Ic1ab6d04232abb3cf347f0d27afbf9172f62b0e4
2016-10-12 09:43:26 -07:00
James E. Blair
e82731f0f3 Run ansible apply test in parallel
Change-Id: Ic5b5ef5ca115ca244ebf86079f9b192fbb13fad6
2016-10-04 15:29:25 -07:00
James E. Blair
a01bec1fc6 Use ansible for puppet apply test
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
2016-10-04 22:29:00 +00:00
K Jonathan Harker
166b00c17f Add support for logstash-filter integration tests
Add a script for integration testing with
openstack-infra/logstash-filters and refactor the apply-test script to
leverage much of the prep work done there.

Also add some needed parameters to install arbitrary versions of the
logstash-filters repo.

Change-Id: Ifcc7fb13c4fb21986e33327487c739966e4bb107
2016-05-25 14:06:15 -07:00