Commit Graph

71 Commits

Author SHA1 Message Date
Clark Boylan d4f390b626 Retire this repo
The opendev project has been moving away from puppet and this is one of
the puppet modules that is no longer used. To simplify things for us we
are taking the extra step of retiring this repo.

Change-Id: I577721e214940a0c25c1a22bd98adc6de83c8b56
2022-02-17 11:57:26 -08:00
OpenDev Sysadmins aa3acb9a1d OpenDev Migration Patch
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.
2019-04-19 19:25:36 +00:00
Ian Wienand 6c5903c2bf 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: I809974db704f559e7de255479246ed1ab4243c34
2019-03-24 20:35:41 +00:00
Jeremy Stanley fb4deb2cb2 Wait to join channels until identified by NickServ
With all our channels mode +r these days, the first few the meetbot
attempts to join are rejected while NickServ is still chewing on the
identify command. Use the supybot configuration option to delay
joining until we get identification confirmed.

Change-Id: I0631cfbba46dfe3c23ff5e455f2ac941b5655c28
2018-08-24 16:46:27 +00:00
Zuul 2c87234ddd Merge "Use httpd::vhost $content parameter" 2018-07-20 18:06:10 +00:00
Colleen Murphy 3725f0ff9c Update Gemfile for Zuulv3
The logic in the Gemfile was relying on Zuulv2 variables to find out
whether the spec helper gem was already available on disk, and since
Zuulv3 has changed things it was failing to find it and downloading the
master version instead. This patch ensures the Gemfile looks for the gem
in the right place when running in CI.

Change-Id: I3d9b01fe25acb5887859fa65d8ca309ce4c965c8
2018-07-12 09:57:45 +02:00
Zuul 3406eb2eac Merge "Add beaker tests" 2018-07-02 20:58:21 +00:00
Zuul fbd5b1515e Merge "Fix template variables" 2018-07-02 20:57:45 +00:00
Zuul 18aff0412e Merge "Fix $manage_index if statement" 2018-06-19 23:11:22 +00:00
Colleen Murphy e40a90fa3e Use httpd::vhost $content parameter
Use the new $content parameter of httpd::vhost instead of $template.
This way, the template gets rendered within the scope where it assumes
most of its variables are, and doesn't need to use the scope object
which doesn't work within a defined type. This will ensure the template
keeps working on puppet 4. This also requires adjusting some of the
template parameters that had previously been correctly scoped from the
httpd::vhost defined type.

Depends-On: https://review.openstack.org/570824

Change-Id: I3a45e99e3355d1e59d57d3d989cc03d253529bf2
2018-05-29 11:22:24 +02:00
Colleen Murphy b44d392811 Add beaker tests
Add functional tests to ensure that the meetbot module can be applied
without errors, and that the service is accessible. It also validates
that the vhost template renders as expected, since this tends to be one
of the harder parts to get right in module development.

Change-Id: I812a7503d0fda4823bbc0bb7b268f8287b2def8b
2018-05-29 09:44:11 +02:00
Colleen Murphy 63153c941e Fix template variables
In the httpd module, serveraliases defaults to undef, which evaluates to
nil in ERB templates. Ensure the template checks for nil values so that
the ServerAlias line is only included if there is a server alias.

Also correct the variable usage in the index.html.erb template.

Change-Id: Ibde097b7dd407884336154a318ec4c5661fda03c
2018-05-29 08:33:03 +02:00
Colleen Murphy 3197184609 Fix $manage_index if statement
Without this patch, with puppet 3, if the $manage_index variable is set,
it is ignored, since the conditional compares the string 'manage_index'
to the value 'true'. With puppet 4, this would cause a syntax error.

Change-Id: If9dc13515059a2c148ddde3108b256feb3bc1298
2018-05-08 19:26:59 -07:00
Colleen Murphy 9cd6a4d6a0 Use instance variables in puppet template
Using local ruby variables in puppet ERB templates was deprecated in
puppet 3 and doesn't work any more in puppet 4. Access these values as
ruby instance variables instead.

Change-Id: I957a5f1c679f0a2172d1a1b88040ae91e239e627
2018-04-20 22:07:03 +02:00
Paul Belanger a45ee742a0
Add support for systemd init scripts
This is needed to support ubuntu xenial.

Change-Id: If30bff94ee0136fbadee7ce994b25842a1cc4270
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2017-12-13 14:21:21 -05:00
Paul Belanger 82a00dacba
Support ubuntu xenial plugins directory
Looks like the location of plugins directory has changed in
ubuntu-xenial. Update manifiest to support both xenial and trusty.

Update service to subscribe to /opt/meetbot this way we don't need to
know which plugins directory is needed when on xenial or trusty.

Change-Id: I70a06093bbb1119aed52627f2a4bf1d07b74cd5b
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2017-12-12 17:58:30 -05:00
Colleen Murphy 81d84046bb Depend on helper gem for spec_helper_acceptance
Instead of keeping a local copy of spec_helper_acceptance.rb and
requiring updates to all modules for any change, we can move it into the
common helper gem and require it from there. This will make it easier to
create and review changes that affect all puppet modules. Also change
the Gemfile to look for the gem in the local workspace if running in a
zuul environment.

Change-Id: I26872912f8ff42227f0d88130807f35d900d1209
2017-08-18 10:41:44 +02:00
Colleen Murphy 667cd78c0a Fix beaker on xenial
Add a xenial nodeset and update the spec helper to install puppet 3 from
the Ubuntu repos instead of from puppetlabs.

Change-Id: Ic67cccd07fba170edf43f71e844703f0b388c171
2017-06-24 15:56:25 +02:00
Spencer Krum 527a0530e6 Use new infra_spec_helper for gem dependencies
Change-Id: I7dcf7de2c3a8f0c3f3d7de322d56e9d138458e2b
2016-06-21 18:39:09 -07:00
Jenkins d630829e3a Merge "Fix deprecated warnings" 2016-06-16 16:54:29 +00:00
Philip Marc Schwartz 2117e374f4 Update pip provider to use openstack_pip provider
Change-Id: Ib0b8a025ad7a0c068fb35178b782ae7c84ad9958
Signed-off-by: Philip Marc Schwartz <philip@progmad.com>
2016-06-16 10:20:07 -04:00
Jenkins d23b9ca9e0 Merge "Fix path issue for /usr/sbin/nologin" 2016-05-27 21:03:35 +00:00
Paul Belanger 1f95777306
Fix deprecated warnings
Change-Id: I179b1cb031f0c9a349e174912167ec43aac9bf89
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-05-27 16:08:28 -04:00
Paul Belanger dada00e5ab
Fix path issue for /usr/sbin/nologin
Change-Id: I4842783ca433a41632dcde8d815d8f957e5a0b66
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-05-27 16:02:01 -04:00
Paul Belanger e1db3a5db0
Add Apache 2.4 syntax
Change-Id: I5b7f86820a7570856541ba868800c60d7f41346e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-05-25 20:47:33 -04:00
Jenkins 8f76ea753d Merge "Indentation of the parameters is refactored" 2016-05-06 03:59:47 +00:00
Spencer Krum c9819fb452 Pin google-api-client; sanitize Gemfile
Change-Id: I322620330db77435ef622285863bc40ec7d3f2bd
2016-04-14 15:21:05 -07:00
Andrey Nikitin ed0dfe85bd Indentation of the parameters is refactored
Indentation of those parameters is changed to follow
Puppet Style Guide recommendation [0].

[0]. https://docs.puppetlabs.com/guides/style_guide.html

Change-Id: I2ba64dd2438caf0eb6ed7a4bd8683708dfb83178
2016-03-22 12:38:22 +03:00
Jenkins a4e8acd612 Merge "Remove logic to check for puppetlabs-apache" 2015-10-21 03:47:57 +00:00
Spencer Krum 33ccecb230 Fix target path for regular git clone during tests
Use same target directory for zuul-cloner and
the regular git command.

Change-Id: I0db9ab98cff46147ddb186a99c7129bfb47c8212
Co-Authored-By: Fabien Boucher <fabien.boucher@enovance.com>
2015-08-19 16:39:59 -07:00
Paul Belanger da89a62596 Remove logic to check for puppetlabs-apache
Now that puppet-httpd has been fully migrated too, we can remove this
obsolete logic.

Change-Id: I7d796a2808891fb686a753d3148204e305b88606
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2015-08-19 09:50:10 -04:00
Colleen Murphy eb6f0e587f Add Gemfile and puppet 4 checks
In anticipation of puppet 4, start trying to deal with puppet 4 things
that can be helpfully predicted by puppet lint plugins. This patch also
corrects lint errors caught by the puppet-lint-empty-check gem.

The $vhost_extra default was changed from empty string to undef, which
will be evaluated as nil in the template and will result in the same
behavior (printing nothing) if left unset.

Change-Id: I31588fb2d4c1894ad9785cd001100a83f4736f2f
2015-08-07 11:53:39 -07:00
Spencer Krum ca60a40269 Boilerplate beaker-rspec files
Change-Id: I3d79aa6a99b2ca4f6f26a24716d637e4a7cfe248
2015-07-28 02:05:04 -07:00
Paul Belanger e3b276c650 Migrate to puppet-httpd module
puppet-httpd is the openstack-infra version of puppetlabs-apache
(0.0.4) release.

This patchset will remove the puppetlabs-apache namespace from -infra
allowing for possible future patchsets to use newer puppetlabs-apache
modules.

Change-Id: I39d337bd09ede21289be67c3c2666aa543e3ec3e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2015-07-21 10:12:41 -04:00
James E. Blair e6ff4136bb Make index management optional
We want to install our own index page, so make the management of
the index.html file optional, defaulting to true.

Change-Id: I09fd41a186eb5edf9368974415cf555c22bbf9d0
2015-05-20 09:33:50 -07:00
Jeremy Stanley 3f792aa7fe Replace ci.o.o links with docs.o.o/infra
The http://ci.openstack.org/ documentation site has been deprecated,
replaced by redirects to corresponding paths within
http://docs.openstack.org/infra/ where other Project Infrastructure
documentation already resides.

Change-Id: I365d37b2a23e75b190add49eab0b1745c41d6e7e
2015-05-14 21:38:18 +00:00
Jenkins 1190b252c2 Merge "Produce html logs for our IRC logs" 2015-05-09 14:54:28 +00:00
Monty Taylor 1adb9b728f Produce html logs for our IRC logs
There is a tool, irclog2html, that knows how to take directories of irc
logs and turn them in to formatted html with per-line links. Since we do
that for build logs, and the logs associated with meetings, it seems
only sane that we do it for channel logs.

The tool groks mtime, so it will skip previously produced logs, and will
overwrite current streaming logs each time it's run. We'll need to run
the command one time by hand first, because the first run might take a
bit to eat through our history.

Change-Id: Ieed2c80d945ee35b29887d672cd9ebbd9ece2188
2015-05-08 19:01:15 -04:00
Ramy Asselin 92d96e4cb6 Rename openstackci to openstackinfra
Change-Id: I8b6b325f308b80dc19db603b42e6369af4a846cb
2015-04-20 13:45:31 -07:00
Jeremy Stanley 80571d4b7a Correct source for plugins directory
Change-Id: I59de1445bf0589d69eef4e2bc61b4ca39ce4c260
2015-02-06 00:37:14 +00:00
Jeremy Stanley c5aecec93a Use present with vcsrepo bzr
undefined method 'latest' for Puppet::Type::Vcsrepo::ProviderBzr

The module documentation seems to use "present" everywhere instead.

Change-Id: Ia6e116b65b7a8b25c40fd289dc3172f5abcf2da7
2015-02-06 00:05:13 +00:00
Jenkins b4ae8cfb9c Merge "Add Bugtracker plugin to meetbot supybot" 2015-02-05 23:30:16 +00:00
Jeremy Stanley 44bd4ef2bc Add missing LICENSE file
The content of this project is Apache 2 licensed, but we should
include a standard LICENSE file just to be clear about that.

Change-Id: Iee6320b9d7e35fbe8d3b0a9794f3e485c18ef2c8
2015-01-29 22:58:43 +00:00
Morgan Fainberg e5545cbaef Add Bugtracker plugin to meetbot supybot
Add the Bugtracker plugin to the supybot used for meetbot (OpenStack).
This will restore the response of bug information to the channel when
a user references a bug in a message (e.g. 'bug XXXXXX').

Change-Id: I3ee3f1fa516bf1607ba6e79c6f911190a49b0161
2015-01-28 11:02:18 -08:00
Mikhail S Medvedev 66fab61dc4 Add standard puppet module files and .gitreview
This module has been split out from system-config, and additional
    files are added to create a proper puppet module.

    The spec:
    http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html

Change-Id: I1b004430c0e676943c57f3ddff4d2ee32f248d2e
2015-01-28 12:10:58 -06:00
James E. Blair 40abbdad88 Add more @ signs to meetbot vhost
Because puppet likes @ signs now.

Change-Id: I1df8740ac27f8e5e4ba6c84e88f72ba8ef1edc69
2014-09-12 10:42:05 -07:00
James E. Blair 7cf8168049 Serve the statusbot alert file from eavesdrop
Change-Id: I5c1a4adc25bab62564effba527122e57c229d1c5
2013-12-11 11:50:42 -08:00
Monty Taylor b583f4f0b3 Use cgit server instead of github for everything
We have a cgit server now, which means we should replace
all references to github with references to git.openstack.org.

Change-Id: I68ad1ce514fb4326c7d9940b5a84999af5b58562
2013-08-19 10:19:47 -07:00
Jeremy Stanley 0004d26ce0 Serve IRC log files as MIME type text/plain.
* modules/meetbot/manifests/site.pp: Specify a nondefault vhost
template.

* modules/meetbot/templates/vhost.erb: New file, similar in content
to the default puppetlabs-apache vhost template but forcing MIME
type text/plain and a default encoding of UTF-8 for files ending in
a .log suffix.

Change-Id: Ief0253c2baac32b126472d0f97f0aa503adbbd7f
2013-07-20 20:36:32 +00:00
Monty Taylor 0a18477e51 Add #openstack-infra to eavesdrop
There have been general requests for more logging of more things. I
think we might have a longer discussion there. But recently there have
been specific requests about -infra. I think that since discussions
around the gate and rather wide-spread project concerns wind up
happening in infra, we should definitely start logging it, and then we
can talk about whether other team channels should be logged or not.

Made this use an array of channels rather than a string for sanity.

Change-Id: I3f3e82aa86155d1ac3010ca3c3ade006b7a26793
2013-07-16 17:44:17 -04:00