diff --git a/hiera/common.yaml b/hiera/common.yaml index 31517347b6..ef9fb07c34 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -108,3 +108,94 @@ statusbot_channels: - storyboard - syscompass - 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' diff --git a/manifests/site.pp b/manifests/site.pp index a94aec1def..4b54e39fb5 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -348,6 +348,7 @@ node 'eavesdrop.openstack.org' { statusbot_irclogs_url => 'http://eavesdrop.openstack.org/irclogs/%(chan)s/%(chan)s.%(date)s.log.html', accessbot_nick => hiera('accessbot_nick', 'username'), accessbot_password => hiera('accessbot_nick_password'), + meetbot_channels => hiera('meetbot_channels', ['openstack-infra']), } } diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index 52ee07fa71..fa96c2b31e 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -16,6 +16,7 @@ class openstack_project::eavesdrop ( $accessbot_nick = '', $accessbot_password = '', $project_config_repo = '', + $meetbot_channels = [], ) { include ::httpd include meetbot @@ -34,98 +35,7 @@ class openstack_project::eavesdrop ( use_ssl => 'True', vhost_extra => $vhost_extra, manage_index => false, - 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', - ], + channels => $meetbot_channels, } class { 'statusbot':