Merge "Add new Sahara repositories for split plugins"

gerrit/projects.yaml

@@ -6859,6 +6859,48 @@
     - sahara
   description: Disk image elements for Sahara
   acl-config: /home/gerrit2/acls/openstack/sahara-etc.config
+- project: openstack/sahara-plugin-ambari
+  description: Ambari provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-ambari
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-cdh
+  description: CDH provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-cdh
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-mapr
+  description: MapR provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-mapr
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-spark
+  description: Spark provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-spark
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-storm
+  description: Storm provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-storm
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
+- project: openstack/sahara-plugin-vanilla
+  description: Plain Hadoop (vanilla) provisioning plugins for Sahara
+  upstream: https://github.com/tellesnobrega/sahara-plugin-vanilla
+  use-storyboard: true
+  acl-config: /home/gerrit2/acls/openstack/sahara.config
+  groups:
+    - sahara
 - project: openstack/sahara-specs
   use-storyboard: true
   groups:

gerritbot/channels.yaml

@@ -1219,11 +1219,7 @@ openstack-merges:
     - openstack/python-troveclient
     - openstack/python-zaqarclient
     - openstack/python-zunclient
-    - openstack/sahara
-    - openstack/sahara-dashboard
-    - openstack/sahara-extra
-    - openstack/sahara-image-elements
-    - openstack/sahara-tests
+    - openstack/sahara.*
     - openstack/swift
     - openstack/swift-bench
     - openstack/tempest
@@ -1609,13 +1605,7 @@ openstack-sahara:
     - openstack/openstack-ansible-os_sahara
     - openstack/puppet-sahara
     - openstack/python-saharaclient
-    - openstack/sahara
-    - openstack/sahara-ci-config
-    - openstack/sahara-dashboard
-    - openstack/sahara-extra
-    - openstack/sahara-image-elements
-    - openstack/sahara-specs
-    - openstack/sahara-tests
+    - openstack/sahara.*
   branches:
     - master
     - ^stable/.*

zuul/main.yaml

@@ -1267,6 +1267,12 @@
           - openstack/sahara-dashboard
           - openstack/sahara-extra
           - openstack/sahara-image-elements
+          - openstack/sahara-plugin-ambari
+          - openstack/sahara-plugin-cdh
+          - openstack/sahara-plugin-mapr
+          - openstack/sahara-plugin-spark
+          - openstack/sahara-plugin-storm
+          - openstack/sahara-plugin-vanilla
           - openstack/sahara-specs
           - openstack/sahara-tests
           - openstack/sardonic