opendev/system-config
Code Issues Proposed changes

Added swift store credentials to openstackwatch.

Browse Source 
Openstackwatch is configured to store feed data in a swift object store.
This patch adds credentials to access that swift store.

Change-Id: I61d9032150ae40fb7d207b5861cf0cf448f6feda
Reviewed-on: https://review.openstack.org/24784
Reviewed-by: Elizabeth Krumbach <lyz@princessleia.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Anita Kuno 2013-03-19 12:18:17 -04:00 committed by Jenkins
parent 8a407df7bf
commit a5e56843de
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -37,6 +37,8 @@ node 'review.openstack.org' {
contactstore_appsec => hiera('gerrit_contactstore_appsec'), contactstore_appsec => hiera('gerrit_contactstore_appsec'),
contactstore_pubkey => hiera('gerrit_contactstore_pubkey'), contactstore_pubkey => hiera('gerrit_contactstore_pubkey'),
sysadmins => hiera('sysadmins'), sysadmins => hiera('sysadmins'),
swift_username => hiera('swift_store_user'),
swift_password => hiera('swift_store_key'),
} }
} }

28
modules/jeepyb/manifests/openstackwatch.pp
View File

@ -1,6 +1,10 @@
# == Class: jeepyb::openstackwatch # == Class: jeepyb::openstackwatch
class jeepyb::openstackwatch( class jeepyb::openstackwatch(
$swift_username = '',
$swift_password = '',
$swift_auth_url = '',
$auth_version = '',
$projects = [], $projects = [],
$mode = 'multiple', $mode = 'multiple',
$container = 'rss', $container = 'rss',
@ -24,17 +28,19 @@ class jeepyb::openstackwatch(
require => Group['openstackwatch'], require => Group['openstackwatch'],
} }
cron { 'openstackwatch': if $swift_password != '' {
ensure => present, cron { 'openstackwatch':
command => '/usr/local/bin/openstackwatch /home/openstackwatch/openstackwatch.ini', ensure => present,
minute => $minute, command => '/usr/local/bin/openstackwatch /home/openstackwatch/openstackwatch.ini',
hour => $hour, minute => $minute,
user => 'openstackwatch', hour => $hour,
require => [ user => 'openstackwatch',
File['/home/openstackwatch/openstackwatch.ini'], require => [
User['openstackwatch'], File['/home/openstackwatch/openstackwatch.ini'],
Class['jeepyb'], User['openstackwatch'],
], Class['jeepyb'],
],
}
} }
file { '/home/openstackwatch/openstackwatch.ini': file { '/home/openstackwatch/openstackwatch.ini':

10
modules/jeepyb/templates/openstackwatch.ini.erb
View File

@ -16,10 +16,10 @@ mode = <%= mode %>
[swift] [swift]
# username/tenant for swift with 2.0 or just username with 1.0 (i.e: # username/tenant for swift with 2.0 or just username with 1.0 (i.e:
# RAX). # RAX).
# username = username = <%= swift_username %>
# passowrd or api key # password or api key
# password = password = <%= swift_password %>
# container to upload (probably want to be public) # container to upload (probably want to be public)
container = <%= container %> container = <%= container %>
@ -28,10 +28,10 @@ container = <%= container %>
# https://auth.api.rackspacecloud.com/v1.0 # https://auth.api.rackspacecloud.com/v1.0
# or Rackspace UK : # or Rackspace UK :
# https://lon.auth.api.rackspacecloud.com/v1.0 # https://lon.auth.api.rackspacecloud.com/v1.0
# auth_url = https://lon.auth.api.rackspacecloud.com/v1.0 auth_url = <%= swift_auth_url %>
# auth version (1.0 for Rackspace clouds, 2.0 for keystone backend clusters) # auth version (1.0 for Rackspace clouds, 2.0 for keystone backend clusters)
# auth_version = 1.0 auth_version = <%= auth_version %>
# the object name where to store the combined rss # the object name where to store the combined rss
uploaded_file = <%= feed %> uploaded_file = <%= feed %>

16
modules/openstack_project/manifests/gerrit.pp
View File

@ -57,7 +57,9 @@ class openstack_project::gerrit (
$cla_id = '2', $cla_id = '2',
$cla_name = 'ICLA', $cla_name = 'ICLA',
$testmode = false, $testmode = false,
$sysadmins = [] $sysadmins = [],
$swift_username = '',
$swift_password = '',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [80, 443, 29418], iptables_public_tcp_ports => [80, 443, 29418],
@ -65,14 +67,18 @@ class openstack_project::gerrit (
} }
class { 'jeepyb::openstackwatch': class { 'jeepyb::openstackwatch':
projects => [ projects => [
'openstack/cinder', 'openstack/cinder',
'openstack/keystone', 'openstack/keystone',
'openstack-dev/devstack', 'openstack-dev/devstack',
], ],
container => 'rss', container => 'rss',
feed => 'openstackwatch.xml', feed => 'openstackwatch.xml',
json_url => 'https://review.openstack.org/query?q=status:open', json_url => 'https://review.openstack.org/query?q=status:open',
swift_username => $swift_username,
swift_password => $swift_password,
swift_auth_url => 'https://auth.api.rackspacecloud.com/v1.0',
auth_version => '1.0',
} }
class { '::gerrit': class { '::gerrit':