summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml2
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml7
-rw-r--r--deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l3-nofeature-ha.yml62
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml63
-rw-r--r--docs/FAQ/index.rst4
-rw-r--r--docs/configguide/installerconfig.rst27
-rw-r--r--docs/configguide/references.rst2
-rw-r--r--docs/release-notes/release-notes.rst37
8 files changed, 164 insertions, 40 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
index 93d9b078..9020ccae 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
@@ -27,7 +27,7 @@
- name: fix openstack neutron plugin config file
shell: |
- sed -i 's,plugins/openvswitch/ovs_neutron_plugin.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
+ sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
systemctl daemon-reload
when: ansible_os_family == 'RedHat'
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
index a73e27a9..d07e187c 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
@@ -7,6 +7,13 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
+
+- name: fix openstack neutron plugin config file
+ shell: |
+ sed -i 's,plugins/ml2/openvswitch_agent.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
+ systemctl daemon-reload
+ when: ansible_os_family == 'RedHat'
+
- name: neutron-db-manage upgrade to Juno
shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
register: result
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l3-nofeature-ha.yml
new file mode 100644
index 00000000..563f6405
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,62 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+odl_l3_agent: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'F8:4A:BF:55:A2:8D'
+ interfaces:
+ - eth1: 'F8:4A:BF:55:A2:8E'
+ ipmiIp: 172.16.130.26
+ ipmiPass: Huawei@123
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host2
+ mac: 'D8:49:0B:DA:5A:B7'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:5A:B8'
+ ipmiIp: 172.16.130.27
+ ipmiPass: huawei@123
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host3
+ mac: 'D8:49:0B:DA:2A:28'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:2A:29'
+ ipmiIp: 172.16.130.29
+ ipmiPass: Huawei@123
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host4
+ mac: 'D8:49:0B:DA:5B:5D'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:5B:5E'
+ ipmiIp: 172.16.130.30
+ ipmiPass: Huawei@123
+ roles:
+ - compute
+
+ - name: host5
+ mac: 'D8:49:0B:DA:56:85'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:56:86'
+ ipmiIp: 172.16.130.31
+ ipmiPass: Huawei@123
+ roles:
+ - compute
+
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
new file mode 100644
index 00000000..b7914374
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,63 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: root
+ipmiVer: '1.0'
+
+odl_l3_agent: "Enable"
+
+hosts:
+ - name: host1
+ mac: '00:1E:67:D4:30:D2'
+ interfaces:
+ - eth2: '00:1E:67:C5:5B:28'
+ - eth3: '00:1E:67:C5:5B:29'
+ ipmiIp: 10.2.117.127
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host2
+ mac: '00:1E:67:D4:39:B5'
+ interfaces:
+ - eth2: '00:1E:67:C5:52:24'
+ - eth3: '00:1E:67:C5:52:25'
+ ipmiIp: 10.2.117.129
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host3
+ mac: '00:1E:67:D4:31:B2'
+ interfaces:
+ - eth2: '00:1E:67:C1:FA:E0'
+ - eth3: '00:1E:67:C1:FA:E1'
+ ipmiIp: 10.2.117.131
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host4
+ mac: '00:1E:67:D4:34:67'
+ interfaces:
+ - eth2: '00:1E:67:E2:58:80'
+ - eth3: '00:1E:67:E2:58:81'
+ ipmiIp: 10.2.117.133
+ roles:
+ - compute
+
+ - name: host5
+ mac: '00:1E:67:D4:38:42'
+ interfaces:
+ - eth2: '00:1E:67:C1:F9:2C'
+ - eth3: '00:1E:67:C1:F9:2D'
+ ipmiIp: 10.2.117.135
+ roles:
+ - compute
+
diff --git a/docs/FAQ/index.rst b/docs/FAQ/index.rst
index dfe8de3e..f12a327f 100644
--- a/docs/FAQ/index.rst
+++ b/docs/FAQ/index.rst
@@ -10,7 +10,3 @@ Contents:
.. toctree::
:numbered:
:maxdepth: 4
-
- how-to-build-customized-iso.rst
- how-to-deploy-without-internet-access.rst
- how-to-integrate-plugins.rst
diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst
index 3d9269a4..e4611eec 100644
--- a/docs/configguide/installerconfig.rst
+++ b/docs/configguide/installerconfig.rst
@@ -17,8 +17,9 @@ nodes.
The audience of this document is assumed to have good knowledge in
networking and Unix/Linux administration.
+-------------
Preconditions
-=============
+-------------
Before starting the installation of the Brahmaputra release of OPNFV,
some planning must be done.
@@ -28,8 +29,12 @@ Retrieving the installation ISO image
-------------------------------------
First of all, The installation ISO is needed for deploying your OPNFV
-environment, it included packages of Compass,OpenStack,OpenDaylight,ONOS
-and so on. the iso can be retrieved via OPNFV artifacts repository:
+environment, it included packages of Compass, OpenStack, OpenDaylight, ONOS
+and so on.
+
+The stable release ISO can be retrieved via `OPNFV software download page <https://www.opnfv.org/software/>`_
+
+The daily build ISO can be retrieved via OPNFV artifacts repository:
http://artifacts.opnfv.org/
@@ -52,13 +57,18 @@ To retrieve the repository of Compass4nfv on Jumphost use the following command:
- git clone https://gerrit.opnfv.org/gerrit/compass4nfv
+To get stable/brahmaputra release, you can use the following command:
+
+- git checkout brahmaputra.1.0
+
NOTE: PLEASE DO NOT GIT CLONE COMPASS4NFV IN root DIRECTORY.
-If you don't have a Linux foundation user id, get your own by the url:
+If you don't have a Linux foundation user id, get it first by the url:
https://wiki.opnfv.org/developer/getting_started
-Set the branch to the corresponding deployment scripts:
+If you want to use a daily release ISO, please checkout the corresponding sha1 to
+get the deployment scripts:
E.g.
Git sha1 in file "opnfv-2016-01-16_15-03-18.properties" is
@@ -75,9 +85,9 @@ than or equal 3 servers, the Bare Metal deployment is recommended. The minimum n
servers for Bare metal deployment is 3, 1 for JumpServer(Jumphost), 1 for controller,
1 for compute.
-
+------------------
Setup Requirements
-==================
+------------------
Jumphost Requirements
---------------------
@@ -158,8 +168,9 @@ In order to execute a deployment, one must gather the following information:
3. MAC address of Control Plane / Provisioning interfaces of the Bare Metal nodes.
+----------------------------------
Installation Guide (BM Deployment)
-==================================
+----------------------------------
Nodes Configuration (BM Deployment)
-----------------------------------
diff --git a/docs/configguide/references.rst b/docs/configguide/references.rst
index 0f317dd5..467bf08d 100644
--- a/docs/configguide/references.rst
+++ b/docs/configguide/references.rst
@@ -36,5 +36,3 @@ Compass
`Compass Home Page <http://www.syscompass.org/>`_
-:Authors: Justin Chi (HUAWEI)
-
diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst
index 9c4267a4..5b277db0 100644
--- a/docs/release-notes/release-notes.rst
+++ b/docs/release-notes/release-notes.rst
@@ -18,9 +18,8 @@ Introduction
Compass4nfv is an OPNFV installer project based on open source project Compass,
which provides automated deployment and management of OpenStack and other distributed systems.
-Provide a brief introduction of how this release is used in OPNFV release using <XYZ> as a deployment tool
-
-Be sure to reference your installation-instructions.
+Please carefully follow the Installation Instructions to deploy OPNFV using Compass4nfv
+installer.
Release Data
============
@@ -48,27 +47,16 @@ Deliverables
Software deliverables
~~~~~~~~~~~~~~~~~~~~~
- - Deployment Script
-
- It is a part of Compass4nfv repository, the entry of deployment sctripts is "compass4nfv/deploy.sh",
- to retrieve the repository of Compass4nfv by following command:
-
- git clone https://gerrit.opnfv.org/gerrit/compass4nfv
-
- - `Compass4nfv ISO link <http://artifacts.opnfv.org/compass4nfv/brahmaputra/opnfv-2016-02-17_14-01-01.iso>`_
-
-.. This link will be updated at final release.
+ - Compass4nfv/Brahmaputra.1.0 ISO, please get it from `OPNFV software download page <https://www.opnfv.org/software/>`_
.. _document-label:
Documentation deliverables
~~~~~~~~~~~~~~~~~~~~~~~~~~
- - `Installation Instructions <http://artifacts.opnfv.org/compass4nfv/brahmaputra/docs/Brahmaputra_installation-instructions/index.html>`_
-
- - `Release Notes <http://artifacts.opnfv.org/compass4nfv/brahmaputra/docs/Brahmaputra_release-notes/index.html>`_
+ - OPNFV(Brahmaputra) Compass4nfv installation instructions
- - `FAQ <http://artifacts.opnfv.org/compass4nfv/brahmaputra/docs/Brahmaputra_FAQ/index.html>`_
+ - OPNFV(Brahmaputra) Compass4nfv Release Notes
Version change
--------------
@@ -82,11 +70,11 @@ upstream components supported with this release.
- Ubuntu 14.04.3
- - Openstack Liberty
+ - Openstack (Liberty release)
- - Opendaylight
+ - Opendaylight (Beryllium rc1 release)
- - ONOS Emu
+ - ONOS (Emu release)
Document version change
~~~~~~~~~~~~~~~~~~~~~~~
@@ -109,7 +97,7 @@ Feature additions
| JIRA: COMPASS-307 | Integration OpenDaylight Beryllium |
| | |
+--------------------------------------+-----------------------------------------+
-| JIRA: | |
+| | |
| | |
+--------------------------------------+-----------------------------------------+
@@ -154,14 +142,13 @@ See JIRA: <link>
Test Result
===========
-Brahmaputra test result using <Compass4nfv> as deployment tool.
+The Brahmaputra release with the Compass4nfv deployment toolchain has undergone QA test
+runs with the following results:
- `Functest test result <http://artifacts.opnfv.org/functest/docs/results/overview.html>`_
+ - `Yardstick test result <http://testresults.opnfv.org/grafana/>`_
References
==========
For more information on the OPNFV Brahmaputra release, please visit
http://www.opnfv.org/brahmaputra
-
-:Authors: Justin Chi (HUAWEI)
-:Version: 0.0.1