summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/patch-repos/build/repos/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch126
-rw-r--r--deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml6
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml6
-rw-r--r--docs/buildprocedure/build.instruction.rst8
-rw-r--r--docs/installationprocedure/installation.instruction.rst8
-rw-r--r--docs/releasenotes/release-notes.rst38
6 files changed, 165 insertions, 27 deletions
diff --git a/build/patch-repos/build/repos/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch b/build/patch-repos/build/repos/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch
new file mode 100644
index 000000000..fd929323f
--- /dev/null
+++ b/build/patch-repos/build/repos/fuel-library/0004-Shift-public-ping-checker-into-deployment-stage.patch
@@ -0,0 +1,126 @@
+From 60dbecc548b4a81b99d50feac96864ed42d9af4b Mon Sep 17 00:00:00 2001
+From: Michael Polenchuk <mpolenchuk@mirantis.com>
+Date: Wed, 26 Oct 2016 15:26:11 +0300
+Subject: [PATCH] Shift public ping checker into deployment stage
+
+Avoid public vip failover at the end of post-deployment
+by moving ping_checker resource into deployment stage.
+Also pingd constraint has been changed to be based on score.
+If all the nodes failed to ping the default gw, the resource
+ain't stopped and remains on the last node where it was.
+
+Change-Id: I666fbbbe98d000c66f97cf4751f304a2da9aad67
+---
+ .../puppet/cluster/manifests/virtual_ip_ping.pp | 10 +++----
+ .../puppet/osnailyfacter/modular/astute/tasks.yaml | 15 ----------
+ .../osnailyfacter/modular/virtual_ips/tasks.yaml | 30 ++++++++++++++++++++
+ 3 files changed, 35 insertions(+), 20 deletions(-)
+
+diff --git a/deployment/puppet/cluster/manifests/virtual_ip_ping.pp b/deployment/puppet/cluster/manifests/virtual_ip_ping.pp
+index 3e49c09..7642422 100644
+--- a/deployment/puppet/cluster/manifests/virtual_ip_ping.pp
++++ b/deployment/puppet/cluster/manifests/virtual_ip_ping.pp
+@@ -11,7 +11,7 @@ define cluster::virtual_ip_ping (
+ $parameters = {
+ 'host_list' => $host_list,
+ 'multiplier' => '1000',
+- 'dampen' => '30s',
++ 'dampen' => '45s',
+ 'timeout' => '3s',
+ }
+ $operations = {
+@@ -41,16 +41,16 @@ define cluster::virtual_ip_ping (
+ primitive => $vip_name,
+ rules => [
+ {
+- 'score' => '-inf',
++ 'score' => '50',
+ 'expressions' => [
+ {
+ 'attribute' => "pingd",
+- 'operation' => 'not_defined',
++ 'operation' => 'defined',
+ },
+ {
+ 'attribute' => "pingd",
+- 'operation'=>'lte',
+- 'value' => '0',
++ 'operation'=>'gte',
++ 'value' => '1',
+ },
+ ],
+ },
+diff --git a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+index 5e3e6ee..83242c4 100644
+--- a/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
++++ b/deployment/puppet/osnailyfacter/modular/astute/tasks.yaml
+@@ -10,7 +10,6 @@
+ cross-depends:
+ - name: dns-client
+ - name: ntp-server
+- - name: public_vip_ping
+ parameters:
+ cmd: ruby /etc/puppet/modules/osnailyfacter/modular/astute/enable_quorum.rb
+ timeout: 180
+@@ -110,20 +109,6 @@
+ timeout: 180
+ cwd: /
+
+-- id: public_vip_ping
+- type: puppet
+- version: 2.1.0
+- role: [primary-controller, controller]
+- requires: [post_deployment_start]
+- required_for: [post_deployment_end]
+- condition:
+- yaql_exp: "changed($.network_scheme) or changed($.get('run_ping_checker'))"
+- parameters:
+- puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
+- puppet_modules: /etc/puppet/modules
+- timeout: 3600
+- cwd: /
+-
+ - id: configure_default_route
+ type: puppet
+ version: 2.1.0
+diff --git a/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml b/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
+index 00d4306..7420099 100644
+--- a/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
++++ b/deployment/puppet/osnailyfacter/modular/virtual_ips/tasks.yaml
+@@ -34,3 +34,33 @@
+ cmd: ruby /etc/puppet/modules/osnailyfacter/modular/virtual_ips/conntrackd_pre.rb
+ test_post:
+ cmd: ruby /etc/puppet/modules/osnailyfacter/modular/virtual_ips/conntrackd_post.rb
++
++- id: primary_public_vip_ping
++ type: puppet
++ version: 2.1.0
++ groups: [primary-controller]
++ requires: [virtual_ips]
++ required_for: [primary-cluster-haproxy]
++ condition:
++ yaql_exp: &pub_viping "changed($.network_scheme) or changed($.get('run_ping_checker'))"
++ parameters:
++ puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
++ puppet_modules: /etc/puppet/modules
++ timeout: 300
++ cwd: /
++
++- id: public_vip_ping
++ type: puppet
++ version: 2.1.0
++ groups: [controller]
++ requires: [virtual_ips]
++ required_for: [deploy_end]
++ condition:
++ yaql_exp: *pub_viping
++ cross-depends:
++ - name: primary_public_vip_ping
++ parameters:
++ puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/virtual_ips/public_vip_ping.pp
++ puppet_modules: /etc/puppet/modules
++ timeout: 300
++ cwd: /
+--
+1.7.9.5
+
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 90c89aedc..f159293e9 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -36,6 +36,12 @@ stack-extensions:
module-config-name: fuel-odl
module-config-version: 0.9.0
module-config-override:
+ metadata:
+ versions:
+ - odl_v2:
+ value: false
+ metadata:
+ plugin_version: 0.9.0
# Note that the module substitionion does not support arrays
# This is a quick fix
# - module: opendaylight
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index f8787d780..b1ef94712 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -36,6 +36,12 @@ stack-extensions:
module-config-name: fuel-odl
module-config-version: 0.9.0
module-config-override:
+ metadata:
+ versions:
+ - odl_v2:
+ value: false
+ metadata:
+ plugin_version: 0.9.0
# Note that the module substitionion does not support arrays
# This is a quick fix
# - module: opendaylight
diff --git a/docs/buildprocedure/build.instruction.rst b/docs/buildprocedure/build.instruction.rst
index d755ee5fb..e49ad08e7 100644
--- a/docs/buildprocedure/build.instruction.rst
+++ b/docs/buildprocedure/build.instruction.rst
@@ -125,7 +125,7 @@ Check out the Colorado release:
.. code-block:: bash
$ cd fuel
- $ git checkout colorado.1.0
+ $ git checkout colorado.2.0
Clone the OPNFV code Git repository without a SSH key
-----------------------------------------------------
@@ -298,8 +298,8 @@ The artifacts produced are:
References
==========
-1) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html
+1) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html
-2) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/buildprocedure/index.html
+2) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html
-3) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html
+3) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html
diff --git a/docs/installationprocedure/installation.instruction.rst b/docs/installationprocedure/installation.instruction.rst
index 2d6889bf8..4419459a1 100644
--- a/docs/installationprocedure/installation.instruction.rst
+++ b/docs/installationprocedure/installation.instruction.rst
@@ -60,7 +60,7 @@ baseline required to replicate the Colorado release:
.. code-block:: bash
- $ git checkout colorado.1.0
+ $ git checkout colorado.2.0
Go to the fuel directory and build the .iso:
@@ -684,8 +684,8 @@ Fuel
Fuel in OPNFV
=============
-13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html
+13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html
-14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/buildprocedure/index.html
+14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html
-15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html
+15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_: http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html
diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst
index c3398df19..4d880ddfd 100644
--- a/docs/releasenotes/release-notes.rst
+++ b/docs/releasenotes/release-notes.rst
@@ -8,7 +8,7 @@
Abstract
========
-This document compiles the release notes for the Colorado 1.0 release of
+This document compiles the release notes for the Colorado 2.0 release of
OPNFV when using Fuel as a deployment tool.
===============
@@ -16,7 +16,7 @@ Important notes
===============
These notes provides release information for the use of Fuel as deployment
-tool for the Colorado 1.0 release of OPNFV.
+tool for the Colorado 2.0 release of OPNFV.
The goal of the Colorado release and this Fuel-based deployment process is
to establish a lab ready platform accelerating further development
@@ -31,7 +31,7 @@ Summary
For Colorado, the typical use of Fuel as an OpenStack installer is
supplemented with OPNFV unique components such as:
-- `OpenDaylight <http://www.opendaylight.org/software>`_ version "Beryllium SR3" [1]_ 'http://www.opendaylight.org/software'
+- `OpenDaylight <http://www.opendaylight.org/software>`_ version "Boron" [1]_ 'http://www.opendaylight.org/software'
- `ONOS <http://onosproject.org/>`_ version "Drake" 'http://onosproject.org/'
@@ -80,13 +80,13 @@ Release Data
| **Project** | fuel |
| | |
+--------------------------------------+--------------------------------------+
-| **Repo/tag** | colorado.1.0 |
+| **Repo/tag** | colorado.2.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release designation** | Colorado 1.0 main release |
+| **Release designation** | Colorado 2.0 follow-up release |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | September 22 2016 |
+| **Release date** | November 10 2016 |
| | |
+--------------------------------------+--------------------------------------+
| **Purpose of the delivery** | Colorado alignment to Released |
@@ -102,7 +102,7 @@ Release Data
| | - Promise |
| | - Parser |
| | - Doctor |
-| | |
+| | - Tacker |
+--------------------------------------+--------------------------------------+
Version change
@@ -110,20 +110,20 @@ Version change
Module version changes
----------------------
-This is the Colorado 1.0 main release.
+This is the Colorado 2.0 follow-up release.
It is based on following upstream versions:
- Fuel 9.0 Base release
- OpenStack Mitaka release
-- OpenDaylight Beryllium SR3 release [1]_
+- OpenDaylight Boron release [1]_
- ONOS Drake release
Document changes
----------------
-This is the Colorado 1.0 main release.
+This is the Colorado 2.0 follow-up release.
It comes with the following documentation:
- Installation instructions - *Reference 13* - **Changed**
@@ -146,7 +146,7 @@ Bug corrections
**JIRA TICKETS:**
-`Colorado 1.0 bug fixes <https://jira.opnfv.org/issues/?filter=11180>`_ 'https://jira.opnfv.org/issues/?filter=11180'
+`Colorado 2.0 bug fixes <https://jira.opnfv.org/issues/?filter=11203>`_ 'https://jira.opnfv.org/issues/?filter=11203'
(Also See respective Integrated feature project's bug tracking)
@@ -188,7 +188,7 @@ Known issues
**JIRA TICKETS:**
-`Known issues <https://jira.opnfv.org/issues/?filter=11183>`_ 'https://jira.opnfv.org/issues/?filter=11183'
+`Known issues <https://jira.opnfv.org/issues/?filter=11205>`_ 'https://jira.opnfv.org/issues/?filter=11205'
(Also See respective Integrated feature project's bug tracking)
@@ -197,20 +197,20 @@ Workarounds
**JIRA TICKETS:**
-`Workarounds <https://jira.opnfv.org/issues/?filter=11181>`_ 'https://jira.opnfv.org/issues/?filter=11181'
+`Workarounds <https://jira.opnfv.org/issues/?filter=11204>`_ 'https://jira.opnfv.org/issues/?filter=11204'
(Also See respective Integrated feature project's bug tracking)
============
Test results
============
-The Colorado 1.0 release with the Fuel deployment tool has undergone QA test
+The Colorado 2.0 release with the Fuel deployment tool has undergone QA test
runs, see separate test results.
==========
References
==========
-For more information on the OPNFV Colorado release, please see:
+For more information on the OPNFV Colorado 2.0 release, please see:
OPNFV
=====
@@ -251,10 +251,10 @@ Fuel
Fuel in OPNFV
=============
-13) `OPNFV Installation instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/docs/installationprocedure/index.html'
+13) `OPNFV Installation instruction for the Colorado 2.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/2.0/docs/installationprocedure/index.html'
-14) `OPNFV Build instruction for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/buildprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/docs/buildprocedure/index.html'
+14) `OPNFV Build instruction for the Colorado 2.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/2.0/docs/buildprocedure/index.html'
-15) `OPNFV Release Note for the Colorado release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/docs/releasenotes/index.html'
+15) `OPNFV Release Note for the Colorado 2.0 release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html>`_ 'http://artifacts.opnfv.org/fuel/colorado/2.0/docs/releasenotes/index.html'
-.. [1] OpenDaylight Boron RC3.5 is used when Service Function Chaining is enabled in Fuel plugin.
+.. [1] OpenDaylight Beryllium SR3 is used when BGP VPN is enabled in Fuel plugin.