Merge "Updates RPM spec version for SR2" into stable/brahmaputra

diff --git a/build/opnfv-tripleo-heat-templates.patch b/build/opnfv-tripleo-heat-templates.patch
index f254b7e..7105abc 100644 (file)
--- a/build/opnfv-tripleo-heat-templates.patch
+++ b/build/opnfv-tripleo-heat-templates.patch
@@ -1,4 +1,4 @@
-From 1c3aac51b3b74cc82088659e0141bfecbf4b0cc8 Mon Sep 17 00:00:00 2001
+From 69b78957a3547439398aa000598bc2fcf87b8d96 Mon Sep 17 00:00:00 2001
 From: Tim Rozet <tdrozet@gmail.com>
 Date: Tue, 12 Jan 2016 16:49:57 -0500
 Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
@@ -6,8 +6,8 @@ Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
 ---
  environments/onos.yaml                             |   8 +
  environments/opendaylight-external.yaml            |  25 ++
- environments/opendaylight.yaml                     |  25 ++
- environments/opendaylight_l3.yaml                  |   9 +
+ environments/opendaylight.yaml                     |  26 ++
+ environments/opendaylight_l3.yaml                  |  10 +
  environments/opendaylight_sdnvpn.yaml              |  29 ++
  environments/opendaylight_sfc.yaml                 |  28 ++
  environments/storage-environment.yaml              |   4 +
@@ -24,7 +24,7 @@ Subject: [PATCH] Adds current opnfv patch with ODL and ONOS support
  puppet/manifests/overcloud_controller_pacemaker.pp | 487 ++++++++++++++-------
  puppet/manifests/overcloud_opendaylight.pp         |  27 ++
  puppet/opendaylight-puppet.yaml                    | 223 ++++++++++
- 20 files changed, 1292 insertions(+), 170 deletions(-)
+ 20 files changed, 1294 insertions(+), 170 deletions(-)
  create mode 100644 environments/onos.yaml
  create mode 100644 environments/opendaylight-external.yaml
  create mode 100644 environments/opendaylight.yaml
@@ -81,10 +81,10 @@ index 0000000..411df21
 +      #opendaylight_install: true
 diff --git a/environments/opendaylight.yaml b/environments/opendaylight.yaml
 new file mode 100644
-index 0000000..c8abf75
+index 0000000..ca8b226
 --- /dev/null
 +++ b/environments/opendaylight.yaml
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
 +# Environment file used to enable OpenDaylight
 +# Currently uses overcloud image that is assumed
 +# to be virt-customized with ODL RPM already on it
@@ -103,6 +103,7 @@ index 0000000..c8abf75
 +    # increase this if you need more ODL nodes
 +    # OpenDaylightCount: 1
 +    NeutronL3HA: false
++    OpenDaylightFeatures: "odl-ovsdb-openstack,odl-dlux-all"
 +    ExtraConfig:
 +      neutron_mechanism_drivers: ['opendaylight']
 +      neutron_tenant_network_type: vxlan
@@ -112,15 +113,16 @@ index 0000000..c8abf75
 +      opendaylight_install: true
 diff --git a/environments/opendaylight_l3.yaml b/environments/opendaylight_l3.yaml
 new file mode 100644
-index 0000000..05c0aff
+index 0000000..a902759
 --- /dev/null
 +++ b/environments/opendaylight_l3.yaml
-@@ -0,0 +1,9 @@
+@@ -0,0 +1,10 @@
 +parameters:
 +    #NeutronEnableL3Agent: false
 +    NeutronEnableForceMetadata: true
 +    OpenDaylightEnableL3: "'yes'"
 +    NeutronServicePlugins: "networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
++    OpenDaylightFeatures: "odl-ovsdb-openstack,odl-dlux-all"
 +    ExtraConfig:
 +      neutron_mechanism_drivers: ['opendaylight']
 +      neutron_tenant_network_type: vxlan

diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
index 8507c73..68f31b6 100644 (file)
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -29,11 +29,14 @@ Version history
 | 2015-09-17         | 1.0.0              | Dan Radez          | Rewritten for      |
 |                    |                    |                    | RDO Manager update |
 +--------------------+--------------------+--------------------+--------------------+
+| 2015-04-26         | 2.0.0              | Tim Rozet          | Brahmaputra SR2    |
+|                    |                    |                    | update             |
++--------------------+--------------------+--------------------+--------------------+
 
 Important notes
 ===============
 
-This is the OPNFV Brahmaputra release that implements the deploy stage of the OPNFV CI pipeline via Apex.
+This is the OPNFV Brahmaputra SR2 release that implements the deploy stage of the OPNFV CI pipeline via Apex.
 
 Apex is based on RDO Manager. More information at http://rdoproject.org
 
@@ -63,16 +66,16 @@ Release Data
 | **Project**                          | apex                                 |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Repo/tag**                         | apex/brahmaputra.1.0                 |
+| **Repo/tag**                         | apex/brahmaputra.3.0                 |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release designation**              | brahmaputra.1.0                      |
+| **Release designation**              | brahmaputra.3.0                      |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Release date**                     | 2015-02-25                           |
+| **Release date**                     | 2016-04-28                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| **Purpose of the delivery**          | OPNFV Brahmaputra release            |
+| **Purpose of the delivery**          | OPNFV Brahmaputra SR2 release        |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
 
@@ -81,12 +84,12 @@ Version change
 
 Module version changes
 ~~~~~~~~~~~~~~~~~~~~~~
-This is the first tracked version of the Brahmaputra release with the Apex deployment toolchain.
+This is the second service release version of the Brahmaputra with the Apex deployment toolchain.
 It is based on following upstream versions:
 
 - OpenStack (Liberty release)
 
-- OpenDaylight (Beryllium release)
+- OpenDaylight (Beryllium SR2 release)
 
 - CentOS 7
 
@@ -106,14 +109,14 @@ Feature additions
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: APEX-32                        | Build.sh integration of RDO Manager  |
+| JIRA: APEX-118                       | SDNVPN scenario added                |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: APEX-6                         | Deploy.sh integration of RDO Manager |
+| JIRA: APEX-89                        | Deploy Ceph OSDs on compute nodes    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: APEX-34                        | Migrate and update Release           |
-|                                      | Documentation for Brahmaputra        |
+| JIRA: APEX-47                        | Integrate Tacker as part of SFC      |
+|                                      | Experimental Feature                 |
 +--------------------------------------+--------------------------------------+
 
 Bug corrections
@@ -125,9 +128,42 @@ Bug corrections
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
+| JIRA: APEX-140                       | Fixes non-default libvirtd network   |
+|                                      | subnet in virtual deployments        |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-139                       | Increases timeout for detecting      |
+|                                      | Undercloud IP                        |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-113                       | Missing neutron-ovs-agent in no SDN  |
+|                                      | HA mode                              |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-116                       | SFC compute node tables may not      |
+|                                      | offset correctl                      |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-115                       | DHCP metadata is disabled for        |
+|                                      | isolated networks                    |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-121                       | VM Storage deletion intermittently   |
+|                                      | fails                                |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-110                       | Deployment with no SDN no HA fails   |
 |                                      |                                      |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-137                       | Added arping as dependency for ONOS  |
+|                                      | deployments                          |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-136                       | 2 Network deployment fails           |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-114                       | OpenDaylight GUI is not available    |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
+| JIRA: APEX-84                        | --flat option no longer working      |
+|                                      |                                      |
++--------------------------------------+--------------------------------------+
+| JIRA: APEX-99                        | Syntax error when                    |
+|                                      | running opnfv-deploy                 |
++--------------------------------------+--------------------------------------+
 
 Deliverables
 ------------
@@ -145,7 +181,7 @@ opnfv-clean - Automatically resets a Target OPNFV Deployment
 Documentation deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 - OPNFV Installation instructions for the Brahmaputra release with the Apex deployment toolchain - ver. 1.0.0
-- OPNFV Release Notes for the Brahmaputra release with the Apex deployment toolchain - ver. 1.0.0 (this document)
+- OPNFV Release Notes for the Brahmaputra SR2 release with the Apex deployment toolchain - ver. 2.0.0 (this document)
 
 Known Limitations, Issues and Workarounds
 =========================================
@@ -171,9 +207,6 @@ Known issues
 | **JIRA REFERENCE**                   | **SLOGAN**                           |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
-| JIRA: APEX-89                        | Deploy Ceph OSDs on the compute      |
-|                                      | nodes also                           |
-+--------------------------------------+--------------------------------------+
 | JIRA: APEX-27                        | OpenContrail Support                 |
 |                                      |                                      |
 +--------------------------------------+--------------------------------------+
@@ -183,18 +216,7 @@ Known issues
 | JIRA: APEX-100                       | DNS1 and DNS2 not handled in         |
 |                                      | nic bridging                         |
 +--------------------------------------+--------------------------------------+
-| JIRA: APEX-47                        | Integrate Tacker as part of SFC      |
-|                                      | Experimental Feature                 |
-+--------------------------------------+--------------------------------------+
-| JIRA: APEX-84                        | --flat option no longer working      |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| JIRA: APEX-51                        | Integrate SDNVPN as a deploy option  |
-|                                      |                                      |
-+--------------------------------------+--------------------------------------+
-| JIRA: APEX-99                        | Syntax error when                    |
-|                                      | running opnfv-deploy                 |
-+--------------------------------------+--------------------------------------+
+
 
 Workarounds
 -----------
@@ -223,4 +245,4 @@ http://wiki.opnfv.org/releases/brahmaputra
 
 :Authors: Tim Rozet (trozet@redhat.com)
 :Authors: Dan Radez (dradez@redhat.com)
-:Version: 1.0.0
+:Version: 2.0.0