opendev/system-config
Code Issues Proposed changes

Use public hiera for meetbot channels list

Browse Source 
This list is data, lets put it in yaml

Change-Id: I6e77ae49c3a0f991d011a3e11e4668dbad349b9f
This commit is contained in:
Spencer Krum 2015-12-04 16:43:57 -08:00 committed by Monty Taylor
parent 691897db6f
commit e432cdf1a1
3 changed files with 94 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
hiera/common.yaml
View File

@ -108,3 +108,94 @@ statusbot_channels:
- storyboard - storyboard
- syscompass - syscompass
- tripleo - tripleo
meetbot_channels:
- '#cloudkitty'
- '#congress'
- '#dox'
- '#heat'
- '#kolla'
- '#midonet'
- '#murano'
- '#openstack'
- '#openstack-ansible'
- '#openstack-api'
- '#openstack-app-catalog'
- '#openstack-astara'
- '#openstack-barbican'
- '#openstack-bareon'
- '#openstack-blazar'
- '#openstack-chef'
- '#openstack-cinder'
- '#openstack-cloudpulse'
- '#openstack-community'
- '#openstack-containers'
- '#openstack-cue'
- '#openstack-defcore'
- '#openstack-dev'
- '#openstack-diversity'
- '#openstack-dns'
- '#openstack-doc'
- '#openstack-dragonflow'
- '#openstack-fr'
- '#openstack-freezer'
- '#openstack-glance'
- '#openstack-gslb'
- '#openstack-ha'
- '#openstack-heat-translator'
- '#openstack-horizon'
- '#openstack-i18n'
- '#openstack-infra'
- '#openstack-infra-incident'
- '#openstack-ironic'
- '#openstack-keystone'
- '#openstack-ko'
- '#openstack-kuryr'
- '#openstack-lbaas'
- '#openstack-manila'
- '#openstack-meeting'
- '#openstack-meeting-alt'
- '#openstack-meeting-3'
- '#openstack-meeting-4'
- '#openstack-meeting-cp'
- '#openstack-mistral'
- '#openstack-monasca'
- '#openstack-net-bgpvpn'
- '#openstack-neutron'
- '#openstack-neutron-ovn'
- '#openstack-neutron-release'
- '#openstack-nova'
- '#openstack-operators'
- '#openstack-performance'
- '#openstack-opw'
- '#openstack-oslo'
- '#openstack-qa'
- '#openstack-rally'
- '#openstack-rating'
- '#openstack-release'
- '#openstack-rpm-packaging'
- '#openstack-sahara'
- '#openstack-sdks'
- '#openstack-searchlight'
- '#openstack-security'
- '#openstack-smaug'
- '#openstack-solar'
- '#openstack-sprint'
- '#openstack-stable'
- '#openstack-storlets'
- '#openstack-swauth'
- '#openstack-swift'
- '#openstack-tailgate'
- '#openstack-telemetry'
- '#openstack-trove'
- '#openstack-ux'
- '#openstack-vmware-nsx'
- '#openstack-watcher'
- '#openstack-zaqar'
- '#openstack-zephyr'
- '#puppet-openstack'
- '#refstack'
- '#senlin'
- '#storyboard'
- '#swift3'
- '#tacker'
- '#tripleo'

1
manifests/site.pp
View File

@ -348,6 +348,7 @@ node 'eavesdrop.openstack.org' {
statusbot_irclogs_url => 'http://eavesdrop.openstack.org/irclogs/%(chan)s/%(chan)s.%(date)s.log.html', statusbot_irclogs_url => 'http://eavesdrop.openstack.org/irclogs/%(chan)s/%(chan)s.%(date)s.log.html',
accessbot_nick => hiera('accessbot_nick', 'username'), accessbot_nick => hiera('accessbot_nick', 'username'),
accessbot_password => hiera('accessbot_nick_password'), accessbot_password => hiera('accessbot_nick_password'),
meetbot_channels => hiera('meetbot_channels', ['openstack-infra']),
} }
} }

94
modules/openstack_project/manifests/eavesdrop.pp
View File

@ -16,6 +16,7 @@ class openstack_project::eavesdrop (
$accessbot_nick = '', $accessbot_nick = '',
$accessbot_password = '', $accessbot_password = '',
$project_config_repo = '', $project_config_repo = '',
$meetbot_channels = [],
) { ) {
include ::httpd include ::httpd
include meetbot include meetbot
@ -34,98 +35,7 @@ class openstack_project::eavesdrop (
use_ssl => 'True', use_ssl => 'True',
vhost_extra => $vhost_extra, vhost_extra => $vhost_extra,
manage_index => false, manage_index => false,
channels => [ channels => $meetbot_channels,
'#cloudkitty',
'#congress',
'#dox',
'#heat',
'#kolla',
'#midonet',
'#murano',
'#openstack',
'#openstack-ansible',
'#openstack-api',
'#openstack-app-catalog',
'#openstack-astara',
'#openstack-barbican',
'#openstack-bareon',
'#openstack-blazar',
'#openstack-chef',
'#openstack-cinder',
'#openstack-cloudpulse',
'#openstack-community',
'#openstack-containers',
'#openstack-cue',
'#openstack-defcore',
'#openstack-dev',
'#openstack-diversity',
'#openstack-dns',
'#openstack-doc',
'#openstack-dragonflow',
'#openstack-fr',
'#openstack-freezer',
'#openstack-glance',
'#openstack-gslb',
'#openstack-ha',
'#openstack-heat-translator',
'#openstack-horizon',
'#openstack-i18n',
'#openstack-infra',
'#openstack-infra-incident',
'#openstack-ironic',
'#openstack-keystone',
'#openstack-ko',
'#openstack-kuryr',
'#openstack-lbaas',
'#openstack-manila',
'#openstack-meeting',
'#openstack-meeting-alt',
'#openstack-meeting-3',
'#openstack-meeting-4',
'#openstack-meeting-cp',
'#openstack-mistral',
'#openstack-monasca',
'#openstack-net-bgpvpn',
'#openstack-neutron',
'#openstack-neutron-ovn',
'#openstack-neutron-release',
'#openstack-nova',
'#openstack-operators',
'#openstack-performance',
'#openstack-opw',
'#openstack-oslo',
'#openstack-qa',
'#openstack-rally',
'#openstack-rating',
'#openstack-release',
'#openstack-rpm-packaging',
'#openstack-sahara',
'#openstack-sdks',
'#openstack-searchlight',
'#openstack-security',
'#openstack-smaug',
'#openstack-solar',
'#openstack-sprint',
'#openstack-stable',
'#openstack-storlets',
'#openstack-swauth',
'#openstack-swift',
'#openstack-tailgate',
'#openstack-telemetry',
'#openstack-trove',
'#openstack-ux',
'#openstack-vmware-nsx',
'#openstack-watcher',
'#openstack-zaqar',
'#openstack-zephyr',
'#puppet-openstack',
'#refstack',
'#senlin',
'#storyboard',
'#swift3',
'#tacker',
'#tripleo',
],
} }
class { 'statusbot': class { 'statusbot':