From 28e8be0700da9afc54dc2586330fd2f6e51a5057 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 22 May 2014 19:40:44 +0400 Subject: [PATCH] Remove obsolete #openstack-climate channel Transition period for climate-blazar renaming ended. Change-Id: Ie9fcca1666f4a6f96e13d420044abee07826fada --- manifests/site.pp | 2 +- .../gerritbot/files/gerritbot_channel_config.yaml | 12 ------------ .../openstack_project/files/accessbot/channels.yaml | 1 - modules/openstack_project/manifests/eavesdrop.pp | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1a8a79f1b9..0794119136 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -220,7 +220,7 @@ node 'eavesdrop.openstack.org' { statusbot_nick => hiera('statusbot_nick', 'username'), statusbot_password => hiera('statusbot_nick_password', 'XXX'), statusbot_server => 'chat.freenode.net', - statusbot_channels => 'edeploy, fuel-dev, heat, magnetodb, murano, openstack, openstack-101, openstack-anvil, openstack-bacon, openstack-barbican, openstack-blazar, openstack-board, openstack-ceilometer, openstack-chef, openstack-cinder, openstack-climate, openstack-cloudkeep, openstack-community, openstack-containers, openstack-dev, openstack-dns, openstack-doc, openstack-entropy, openstack-foundation, openstack-gantt, openstack-gate, openstack-hyper-v, openstack-infra, openstack-ironic, openstack-keystone, openstack-manila, openstack-marconi, openstack-meeting, openstack-meeting-3, openstack-meeting-alt, openstack-meniscus, openstack-merges, openstack-metering, openstack-neutron, openstack-nova, openstack-opw, openstack-oslo, openstack-packaging, openstack-qa, openstack-raksha, openstack-relmgr-office, openstack-sahara, openstack-sdks, openstack-state-management, openstack-swift, openstack-translation, openstack-trove, packstack-dev, refstack, storyboard, syscompass, tripleo', + statusbot_channels => 'edeploy, fuel-dev, heat, magnetodb, murano, openstack, openstack-101, openstack-anvil, openstack-bacon, openstack-barbican, openstack-blazar, openstack-board, openstack-ceilometer, openstack-chef, openstack-cinder, openstack-cloudkeep, openstack-community, openstack-containers, openstack-dev, openstack-dns, openstack-doc, openstack-entropy, openstack-foundation, openstack-gantt, openstack-gate, openstack-hyper-v, openstack-infra, openstack-ironic, openstack-keystone, openstack-manila, openstack-marconi, openstack-meeting, openstack-meeting-3, openstack-meeting-alt, openstack-meniscus, openstack-merges, openstack-metering, openstack-neutron, openstack-nova, openstack-opw, openstack-oslo, openstack-packaging, openstack-qa, openstack-raksha, openstack-relmgr-office, openstack-sahara, openstack-sdks, openstack-state-management, openstack-swift, openstack-translation, openstack-trove, packstack-dev, refstack, storyboard, syscompass, tripleo', statusbot_auth_nicks => 'jeblair, ttx, fungi, mordred, clarkb, sdague, SergeyLukjanov, jhesketh, lifeless', statusbot_wiki_user => hiera('statusbot_wiki_username', 'username'), statusbot_wiki_password => hiera('statusbot_wiki_password', 'XXX'), diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml index fe8ffc2a25..8545ef6307 100644 --- a/modules/gerritbot/files/gerritbot_channel_config.yaml +++ b/modules/gerritbot/files/gerritbot_channel_config.yaml @@ -459,18 +459,6 @@ openstack-rally: branches: - master -openstack-climate: - events: - - patchset-created - - change-merged - - x-vrif-minus-2 - projects: - - stackforge/blazar - - stackforge/blazar-nova - - stackforge/python-blazarclient - branches: - - master - openstack-blazar: events: - patchset-created diff --git a/modules/openstack_project/files/accessbot/channels.yaml b/modules/openstack_project/files/accessbot/channels.yaml index f34aa7fbaf..e56f6832db 100644 --- a/modules/openstack_project/files/accessbot/channels.yaml +++ b/modules/openstack_project/files/accessbot/channels.yaml @@ -69,7 +69,6 @@ channels: - name: openstack-ceilometer - name: openstack-chef - name: openstack-cinder - - name: openstack-climate - name: openstack-cloudkeep - name: openstack-community - name: openstack-containers diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp index 6c1e850670..a960fed4b5 100644 --- a/modules/openstack_project/manifests/eavesdrop.pp +++ b/modules/openstack_project/manifests/eavesdrop.pp @@ -42,7 +42,6 @@ class openstack_project::eavesdrop ( '#openstack', '#openstack-blazar', '#openstack-ceilometer', - '#openstack-climate', '#openstack-containers', '#openstack-dev', '#openstack-dns',