X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=README.rst;h=e2b59c593ab823afd8a3a37e80e5238d37c2a22f;hb=f642324cafe3581e78c4bceed594c2818268271e;hp=148a741ff62940620932504053730e5ddd920e7a;hpb=d4cb01089b5cfd78a663995d59a1ca804acb0769;p=apex-tripleo-heat-templates.git

diff --git a/README.rst b/README.rst
index 148a741f..e2b59c59 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,12 @@
+========================
+Team and repository tags
+========================
+
+.. image:: http://governance.openstack.org/badges/tripleo-heat-templates.svg
+    :target: http://governance.openstack.org/reference/tags/index.html
+
+.. Change things from this point on
+
 ======================
 tripleo-heat-templates
 ======================
@@ -15,8 +24,7 @@ Features
 The ability to deploy a multi-node, role based OpenStack deployment using
 OpenStack Heat. Notable features include:
 
- * Choice of deployment/configuration tooling: puppet, os-apply-config, and
-   (soon) docker
+ * Choice of deployment/configuration tooling: puppet, (soon) docker
 
  * Role based deployment: roles for the controller, compute, ceph, swift,
    and cinder storage
@@ -29,8 +37,6 @@ Directories
 
 A description of the directory layout in TripleO Heat Templates.
 
- * deprecated: contains templates that have been deprecated
-
  * environments: contains heat environment files that can be used with -e
                  on the command like to enable features, etc.
 
@@ -45,11 +51,80 @@ A description of the directory layout in TripleO Heat Templates.
  * puppet: templates mostly driven by configuration with puppet. To use these
            templates you can use the overcloud-resource-registry-puppet.yaml.
 
- * os-apply-config: templates mostly driven by configuration w/
-                    os-collect-config and bash based
-                    elements (which use the Heat os-apply-config group).
-                    These will soon be deprecated and are no longer part
-                    of the upstream CI testing efforts.
-
  * validation-scripts: validation scripts useful to all deployment
                        configurations
+
+
+Service testing matrix
+----------------------
+
+The configuration for the CI scenarios will be defined in `tripleo-heat-templates/ci/`
+and should be executed according to the following table:
+
++----------------+-------------+-------------+-------------+-------------+-----------------+
+|        -       | scenario001 | scenario002 | scenario003 | scenario004 | multinode-nonha |
++================+=============+=============+=============+=============+=================+
+| keystone       |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| glance         |    rbd      |    swift    |    file     | swift + rbd |      swift      |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| cinder         |     rbd     |    iscsi    |             |             |      iscsi      |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| heat           |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| mysql          |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| neutron        |     ovs     |     ovs     |     ovs     |     ovs     |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| rabbitmq       |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| mongodb        |      X      |      X      |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| redis          |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| haproxy        |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| keepalived     |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| memcached      |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| pacemaker      |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| nova           |     qemu    |     qemu    |     qemu    |     qemu    |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| ntp            |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| snmp           |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| timezone       |      X      |      X      |      X      |      X      |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| sahara         |             |             |      X      |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| mistral        |             |             |      X      |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| swift          |             |      X      |             |             |        X        |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| aodh           |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| ceilometer     |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| gnocchi        |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| panko          |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| barbican       |             |      X      |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| zaqar          |             |      X      |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| ec2api         |             |      X      |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| cephrgw        |             |      X      |             |      X      |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| tacker         |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| congress       |      X      |             |             |             |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| cephmds        |             |             |             |      X      |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+
+| manila         |             |             |             |      X      |                 |
++----------------+-------------+-------------+-------------+-------------+-----------------+