summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apex/overcloud/deploy.py15
-rwxr-xr-xbuild/overcloud-opendaylight.sh7
-rw-r--r--docs/release/configguide/installerconfig.rst4
-rw-r--r--docs/release/installation/architecture.rst2
-rw-r--r--docs/release/release-notes/index.rst2
-rw-r--r--docs/release/release-notes/release-notes.rst29
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst4
-rw-r--r--docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst4
-rw-r--r--docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst4
-rw-r--r--docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst4
-rw-r--r--docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst4
-rw-r--r--docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst4
-rw-r--r--lib/ansible/playbooks/post_deploy_overcloud.yml12
16 files changed, 26 insertions, 81 deletions
diff --git a/apex/overcloud/deploy.py b/apex/overcloud/deploy.py
index 8016e1f..bf20928 100644
--- a/apex/overcloud/deploy.py
+++ b/apex/overcloud/deploy.py
@@ -11,7 +11,6 @@ import base64
import fileinput
import logging
import os
-import re
import shutil
import uuid
import struct
@@ -175,8 +174,18 @@ def prep_image(ds, img, tmp_dir, root_pw=None):
}])
if ds_opts['vpn']:
- virt_cmds.append({con.VIRT_RUN_CMD: "systemctl enable zrpcd"})
- logging.info("ZRPC and Quagga enabled")
+ virt_cmds.append({con.VIRT_RUN_CMD: "chmod +x /etc/rc.d/rc.local"})
+ virt_cmds.append({
+ con.VIRT_RUN_CMD:
+ "echo '/opt/quagga/etc/init.d/zrpcd start' > "
+ "/opt/quagga/etc/init.d/zrpcd_start.sh"})
+ virt_cmds.append({
+ con.VIRT_RUN_CMD: "chmod +x /opt/quagga/etc/init.d/"
+ "zrpcd_start.sh"})
+ virt_cmds.append({
+ con.VIRT_RUN_CMD: "sed -i '$a /opt/quagga/etc/"
+ "init.d/zrpcd_start.sh' /etc/rc.local "})
+ logging.info("ZRPCD process started")
dataplane = ds_opts['dataplane']
if dataplane == 'ovs_dpdk' or dataplane == 'fdio':
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh
index ed3f539..024c6a5 100755
--- a/build/overcloud-opendaylight.sh
+++ b/build/overcloud-opendaylight.sh
@@ -99,14 +99,13 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
if [ "$(uname -i)" == 'x86_64' ]; then
# Download quagga/zrpc rpms
-populate_cache http://artifacts.opnfv.org/apex/danube/quagga/quagga-3.tar.gz
+populate_cache http://artifacts.opnfv.org/apex/euphrates/quagga/quagga-4.tar.gz
LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \
--install zeromq-4.1.4 \
- --upload ${CACHE_DIR}/quagga-3.tar.gz:/root/ \
- --run-command "cd /root/ && tar xzf quagga-3.tar.gz" \
+ --upload ${CACHE_DIR}/quagga-4.tar.gz:/root/ \
+ --run-command "cd /root/ && tar xzf quagga-4.tar.gz" \
--run-command "cd /root/quagga; packages=\$(ls |grep -vE 'debuginfo|devel|contrib'); yum -y install \$packages" \
- --run-command "sudo usermod -a -G quaggavt quagga" \
-a overcloud-full-opendaylight_build.qcow2
fi
diff --git a/docs/release/configguide/installerconfig.rst b/docs/release/configguide/installerconfig.rst
index 0cbb00f..2571977 100644
--- a/docs/release/configguide/installerconfig.rst
+++ b/docs/release/configguide/installerconfig.rst
@@ -7,5 +7,5 @@
Apex configuration
==================
-.. include:: ../installationprocedure/introduction.rst
-.. include:: ../installationprocedure/baremetal.rst
+.. include:: ../installation/introduction.rst
+.. include:: ../installation/baremetal.rst
diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst
index e2c0bb7..079c26d 100644
--- a/docs/release/installation/architecture.rst
+++ b/docs/release/installation/architecture.rst
@@ -160,7 +160,7 @@ issues per scenario. The following scenarios correspond to a supported
+-------------------------+-------------+---------------+
| os-odl-bgpvpn-noha | SDNVPN | Yes |
+-------------------------+-------------+---------------+
-| os-odl-sfc-ha | SFC | Yes |
+| os-odl-sfc-ha | SFC | No |
+-------------------------+-------------+---------------+
| os-odl-sfc-noha | SFC | Yes |
+-------------------------+-------------+---------------+
diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index a87e261..3fe9463 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -1,4 +1,4 @@
-.. _apex-release-notes:
+.. _apex-releasenotes:
************************
OPNFV Apex Release Notes
diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index a2369e3..4be2e65 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -2,11 +2,6 @@
OPNFV Release Notes for the Euphrates release of OPNFV Apex deployment tool
===========================================================================
-
-.. contents:: Table of Contents
- :backlinks: none
-
-
Abstract
========
@@ -19,28 +14,6 @@ License
All Apex and "common" entities are protected by the Apache 2.0 License
( http://www.apache.org/licenses/ )
-
-Version History
-===============
-
-
-+-------------+-----------+-----------------+----------------------+
-| **Date** | **Ver.** | **Authors** | **Comment** |
-| | | | |
-+-------------+-----------+-----------------+----------------------+
-| 2017-08-28 | 5.0 | Tim Rozet | Updates for Euphrates|
-+-------------+-----------+-----------------+----------------------+
-| 2017-03-30 | 4.0 | Tim Rozet | Updates for Danube |
-+-------------+-----------+-----------------+----------------------+
-| 2016-09-20 | 2.1.0 | Tim Rozet | More updates for |
-| | | | Colorado |
-+-------------+-----------+-----------------+----------------------+
-| 2016-08-11 | 2.0.0 | Dan Radez | Updates for Colorado |
-+-------------+-----------+-----------------+----------------------+
-| 2015-09-17 | 1.0.0 | Dan Radez | Rewritten for |
-| | | | RDO Manager update |
-+-------------+-----------+-----------------+----------------------+
-
Important Notes
===============
@@ -89,7 +62,7 @@ Release Data
| **Release designation** | 5.0.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | 2017-09-17 |
+| **Release date** | 2017-10-20 |
| | |
+--------------------------------------+--------------------------------------+
| **Purpose of the delivery** | OPNFV Euphrates release |
diff --git a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
index 4d8870b..0aa72ba 100644
--- a/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
+++ b/docs/release/scenarios/os-nosdn-nofeature-ha/os-nosdn-nofeature-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
index 33a855d..6889f7d 100644
--- a/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
+++ b/docs/release/scenarios/os-nosdn-nofeature-noha/os-nosdn-nofeature-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst b/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst
index cc5fee3..3908385 100644
--- a/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst
+++ b/docs/release/scenarios/os-nosdn-ovs_dpdk-ha/os-nosdn-ovs_dpdk-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and DPDK enabled Open vSwitch.
-.. contents::
- :depth: 3
- :local:
-
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst b/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst
index b85f6e2..be0f37d 100644
--- a/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst
+++ b/docs/release/scenarios/os-nosdn-ovs_dpdk-noha/os-nosdn-ovs_dpdk-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and DPDK enabled Open vSwitch.
-.. contents::
- :depth: 3
- :local:
-
Introduction
============
diff --git a/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst b/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst
index 1319f42..6437ce1 100644
--- a/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst
+++ b/docs/release/scenarios/os-nosdn-performance-ha/os-nosdn-performance-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with no SDN controller and performance options enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst b/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst
index 331d3b1..b75c435 100644
--- a/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst
+++ b/docs/release/scenarios/os-odl-csit-noha/os-odl-csit-noha.rst
@@ -6,10 +6,6 @@ This document provides scenario level details for Euphrates 1.0 of
deployment with the OpenDaylight SDN controller and only CSIT relevant
features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
index 1036f77..e5561a7 100644
--- a/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
+++ b/docs/release/scenarios/os-odl-nofeature-ha/os-odl-nofeature-ha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with the OpenDaylight SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
index 490cfbd..f04e7c0 100644
--- a/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
+++ b/docs/release/scenarios/os-odl-nofeature-noha/os-odl-nofeature-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with the OpenDaylight SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
index c0f96ab..a838e4b 100644
--- a/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
+++ b/docs/release/scenarios/os-ovn-nofeature-noha/os-ovn-nofeature-noha.rst
@@ -5,10 +5,6 @@
This document provides scenario level details for Euphrates 1.0 of
deployment with the OVN SDN controller and no extra features enabled.
-.. contents::
- :depth: 3
- :local:
-
============
Introduction
============
diff --git a/lib/ansible/playbooks/post_deploy_overcloud.yml b/lib/ansible/playbooks/post_deploy_overcloud.yml
index 5640e90..af1c648 100644
--- a/lib/ansible/playbooks/post_deploy_overcloud.yml
+++ b/lib/ansible/playbooks/post_deploy_overcloud.yml
@@ -22,12 +22,12 @@
when:
- sfc
- "'controller' in ansible_hostname"
- - name: Ensure ZRPCD is up
- systemd:
- name: zrpcd
- state: started
- enabled: yes
- become: yes
+ - name: Ensure ZRPCD is running
+ shell: ps aux | grep zrpcd | grep -v grep
+ ignore_errors: yes
+ changed_when: false
+ register: zrpcd_status
+ failed_when: zrpcd_status.rc == 0
when:
- vpn
- "'controller-0' in ansible_hostname"