From 73c3d3abf5b8a3791a861206f8e4f705240f949e Mon Sep 17 00:00:00 2001
From: "Tullis, Michael L" <michael.l.tullis@intel.com>
Date: Thu, 5 May 2016 12:48:11 -0600
Subject: [PATCH] Per commit 16eaf347 to staging, removing the following bundle
 descriptions from the master branch: openstack-all-in-one openstack-compute
 openstack-compute-controller openstack-configure openstack-controller
 openstack-database openstack-data-processing openstack-lbaas
 openstack-network openstack-telemetry openstack-telemetry-controller
 openstack-vpnaas

---
 source/bundles_overview.rst | 145 ------------------------------------
 1 file changed, 145 deletions(-)

diff --git a/source/bundles_overview.rst b/source/bundles_overview.rst
index dec9fc83..13f75231 100644
--- a/source/bundles_overview.rst
+++ b/source/bundles_overview.rst
@@ -456,34 +456,6 @@ Current list of available bundles:
                     <p>Provides an SSH server (and client)</p>
                 </td>
             </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-all-in-one">openstack-all-in-one</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides an All-in-one OpenStack deployment</p>
-                    <li>Includes (database-mariadb) bundle.</p>
-                        <li>Includes (database-mongodb) bundle.</p>
-                            <li>Includes (message-broker-rabbitmq) bundle.</p>
-                                <li>Includes (openstack-block-storage) bundle.</p>
-                                    <li>Includes (openstack-block-storage-controller) bundle.</p>
-                                        <li>Includes (openstack-compute) bundle.</p>
-                                            <li>Includes (openstack-compute-controller) bundle.</p>
-                                                <li>Includes (openstack-dashboard) bundle.</p>
-                                                    <li>Includes (openstack-data-processing) bundle.</p>
-                                                        <li>Includes (openstack-database) bundle.</p>
-                                                            <li>Includes (openstack-identity) bundle.</p>
-                                                                <li>Includes (openstack-image) bundle.</p>
-                                                                    <li>Includes (openstack-lbaas) bundle.</p>
-                                                                        <li>Includes (openstack-network) bundle.</p>
-                                                                            <li>Includes (openstack-object-storage) bundle.</p>
-                                                                                <li>Includes (openstack-orchestration) bundle.</p>
-                                                                                    <li>Includes (openstack-python-clients) bundle.</p>
-                                                                                        <li>Includes (openstack-telemetry) bundle.</p>
-                                                                                            <li>Includes (openstack-vpnaas) bundle.</p>
-                </td>
-            </tr>
             <tr>
                 <td class="bundlename">
                     <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-block-storage">openstack-block-storage</a>
@@ -514,51 +486,6 @@ Current list of available bundles:
                     <li>Includes (python-basic) bundle.</p>
                 </td>
             </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-compute">openstack-compute</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides an OpenStack nova-compute node</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-compute-controller">openstack-compute-controller</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides an OpenStack Nova control server</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-configure">openstack-configure</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides a suggested default configuration for OpenStack on Clear Linux.</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-controller">openstack-controller</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides an OpenStack multi-service control server</p>
-                    <li>Includes (database-mariadb) bundle.</p>
-                        <li>Includes (message-broker-rabbitmq) bundle.</p>
-                            <li>Includes (openstack-identity) bundle.</p>
-                                <li>Includes (openstack-image) bundle.</p>
-                                    <li>Includes (openstack-compute-controller) bundle.</p>
-                                        <li>Includes (openstack-dashboard) bundle.</p>
-                                            <li>Includes (openstack-python-clients) bundle.</p>
-                </td>
-            </tr>
             <tr>
                 <td class="bundlename">
                     <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-dashboard">openstack-dashboard</a>
@@ -569,26 +496,6 @@ Current list of available bundles:
                     <li>Includes (openstack-common) bundle.</p>
                 </td>
             </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-database">openstack-database</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides a Database as a Service server</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-data-processing">openstack-data-processing</a>
-                </td>
-                <td class="bundlestatus">WIP </td>
-                <td class="bundledesc">
-                    <p>Provides a simple means to provision a data-intensive application cluster </p>
-                    <li>Includes (openstack-common) bundle.</p>
-                </td>
-            </tr>
             <tr>
                 <td class="bundlename">
                     <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-identity">openstack-identity</a>
@@ -609,27 +516,6 @@ Current list of available bundles:
                     <li>Includes (openstack-common) bundle.</p>
                 </td>
             </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-lbaas">openstack-lbaas</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides Load Balancing as a Service</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                        <li>Includes (openstack-network) bundle.</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-network">openstack-network</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides an OpenStack Neutron server</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                </td>
-            </tr>
             <tr>
                 <td class="bundlename">
                     <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-object-storage">openstack-object-storage</a>
@@ -660,26 +546,6 @@ Current list of available bundles:
                     <li>Includes (openstack-common) bundle.</p>
                 </td>
             </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-telemetry">openstack-telemetry</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides an OpenStack Telemetry server</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                </td>
-            </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-telemetry-controller">openstack-telemetry-controller</a>
-                </td>
-                <td class="bundlestatus">Deprecated</td>
-                <td class="bundledesc">
-                    <p>Provides an OpenStack Telemetry server</p>
-                    <li>Includes (openstack-telemetry) bundle.</p>
-                </td>
-            </tr>
             <tr>
                 <td class="bundlename">
                     <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-test-suite">openstack-test-suite</a>
@@ -690,17 +556,6 @@ Current list of available bundles:
                     <li>Includes (openstack-common) bundle.</p>
                 </td>
             </tr>
-            <tr>
-                <td class="bundlename">
-                    <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/openstack-vpnaas">openstack-vpnaas</a>
-                </td>
-                <td class="bundlestatus">WIP</td>
-                <td class="bundledesc">
-                    <p>Provides VPN as a Service</p>
-                    <li>Includes (openstack-common) bundle.</p>
-                        <li>Includes (openstack-network) bundle.</p>
-                </td>
-            </tr>
             <tr>
                 <td class="bundlename">
                     <a href="https://github.com/clearlinux/clr-bundles/tree/master/bundles/os-cloudguest">os-cloudguest</a>