From 88c54920a18202c89f9293bf9886fafeb0a96284 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Fri, 6 Nov 2015 13:39:49 -0800
Subject: [PATCH] Move irc bot from #akanda->#openstack-astara

Change-Id: I07c7df8355d8820bbe4f51c4ad4ff8ca222928e4
---
 accessbot/channels.yaml |  2 +-
 gerritbot/channels.yaml | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index 3b669c1957..fa91ec721d 100755
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -52,7 +52,6 @@ global:
 
 # Individual channel configuration:
 channels:
-  - name: akanda
   - name: cerberus-project
   - name: cloud-init
   - name: cloudkitty
@@ -77,6 +76,7 @@ channels:
   - name: openstack-anvil
   - name: openstack-api
   - name: openstack-app-catalog
+  - name: openstack-astara
   - name: openstack-bacon
   - name: openstack-barbican
   - name: openstack-blazar
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 8797069293..0dad8e15ec 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1,19 +1,4 @@
 # This file is sorted alphabetically by channel name.
-akanda:
-  events:
-    - patchset-created
-    - change-merged
-    - x-vrif-minus-2
-  projects:
-    - openstack/akanda
-    - openstack/akanda-appliance
-    - openstack/akanda-appliance-builder
-    - openstack/akanda-horizon
-    - openstack/akanda-neutron
-    - openstack/akanda-rug
-  branches:
-    - master
-
 cerberus-project:
   events:
     - patchset-created
@@ -271,6 +256,22 @@ openstack-app-catalog:
   branches:
     - master
 
+openstack-astara:
+  events:
+    - patchset-created
+    - change-merged
+    - x-vrif-minus-2
+  projects:
+    - openstack/astara
+    - openstack/astara-appliance
+    - openstack/astara-horizon
+    - openstack/astara-neutron
+  branches:
+    - master
+    - stable/liberty
+    - stable/kilo
+    - stable/juno
+
 openstack-barbican:
   events:
     - patchset-created