diff options
| -rw-r--r-- | INFO | 1 | ||||
| -rw-r--r-- | docs/etc/conf.py | 34 | ||||
| -rw-r--r-- | docs/etc/opnfv-logo.png | bin | 2829 -> 0 bytes | |||
| -rw-r--r-- | docs/labs/zte-sh-lab/index.rst | 6 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/lab_description.rst | 4 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod-1.rst (renamed from docs/labs/zte-sh-lab/pod1_description.rst) | 0 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod-1.yaml (renamed from docs/labs/zte-sh-lab/pod1_inventory.yaml) | 9 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod-2.rst (renamed from docs/labs/zte-sh-lab/pod2_description.rst) | 0 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod-2.yaml (renamed from docs/labs/zte-sh-lab/pod2_inventory.yaml) | 9 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod-3.rst (renamed from docs/labs/zte-sh-lab/pod3_description.rst) | 0 | ||||
| -rw-r--r-- | docs/labs/zte-sh-lab/pod-3.yaml (renamed from docs/labs/zte-sh-lab/pod3_inventory.yaml) | 9 | ||||
| -rw-r--r-- | docs/specification/hardwarespec.rst | 6 | ||||
| -rw-r--r-- | docs/specification/index.rst (renamed from docs/specification/pharosspec.rst) | 0 |
13 files changed, 39 insertions, 39 deletions
@@ -21,6 +21,7 @@ jack.morgan@intel.com jose.lausuch@ericsson.com fatih.degirmenci@ericsson.com daniel.smith@ericsson.com +zhang.jun3g@zte.com.cn Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/ Link(s) to approval of additional committers: diff --git a/docs/etc/conf.py b/docs/etc/conf.py deleted file mode 100644 index 00660351..00000000 --- a/docs/etc/conf.py +++ /dev/null @@ -1,34 +0,0 @@ -import datetime -import sys -import os - -try: - __import__('imp').find_module('sphinx.ext.numfig') - extensions = ['sphinx.ext.numfig'] -except ImportError: - # 'pip install sphinx_numfig' - extensions = ['sphinx_numfig'] - -# numfig: -number_figures = True -figure_caption_prefix = "Fig." - -source_suffix = '.rst' -master_doc = 'index' -pygments_style = 'sphinx' -html_use_index = False - -pdf_documents = [('index', u'OPNFV', u'OPNFV Project', u'OPNFV')] -pdf_fit_mode = "shrink" -pdf_stylesheets = ['sphinx','kerning','a4'] -#latex_domain_indices = False -#latex_use_modindex = False - -latex_elements = { - 'printindex': '', -} - -project = u'OPNFV: Template documentation config' -copyright = u'%s, OPNFV' % datetime.date.today().year -version = u'1.0.0' -release = u'1.0.0' diff --git a/docs/etc/opnfv-logo.png b/docs/etc/opnfv-logo.png Binary files differdeleted file mode 100644 index 1519503e..00000000 --- a/docs/etc/opnfv-logo.png +++ /dev/null diff --git a/docs/labs/zte-sh-lab/index.rst b/docs/labs/zte-sh-lab/index.rst index f8ee36ed..f767d8d5 100644 --- a/docs/labs/zte-sh-lab/index.rst +++ b/docs/labs/zte-sh-lab/index.rst @@ -13,6 +13,6 @@ ZTE SH Pharos Lab Configuration Files :maxdepth: 2 ./lab_description.rst - ./pod1_description.rst - ./pod2_description.rst - ./pod3_description.rst + ./pod-1.rst + ./pod-2.rst + ./pod-3.rst diff --git a/docs/labs/zte-sh-lab/lab_description.rst b/docs/labs/zte-sh-lab/lab_description.rst index 47caed45..0d9d2dd0 100644 --- a/docs/labs/zte-sh-lab/lab_description.rst +++ b/docs/labs/zte-sh-lab/lab_description.rst @@ -95,8 +95,8 @@ Lab Topology .. image:: ./images/zte_sh_lab_topology.png :alt: Lab diagram not found -All the PODs share the same **Jump Host** for only one public IP address is allocated for the -pharos lab. Deploy servers are separated from Jump Host. Every 2 PODs share one **Deploy Server**. +All the PODs share the same **Jump Host** for only one public IP address is allocated for ZTE +Pharos Lab. Deploy servers are separated from Jump Host. Each POD has itsown **Deploy Server**. **Jump Host** diff --git a/docs/labs/zte-sh-lab/pod1_description.rst b/docs/labs/zte-sh-lab/pod-1.rst index 7ec53a82..7ec53a82 100644 --- a/docs/labs/zte-sh-lab/pod1_description.rst +++ b/docs/labs/zte-sh-lab/pod-1.rst diff --git a/docs/labs/zte-sh-lab/pod1_inventory.yaml b/docs/labs/zte-sh-lab/pod-1.yaml index 3414bc12..747461a6 100644 --- a/docs/labs/zte-sh-lab/pod1_inventory.yaml +++ b/docs/labs/zte-sh-lab/pod-1.yaml @@ -1,3 +1,12 @@ +############################################################################## +## Copyright (c) 2015 ZTE Corp. and others. +## +## All rights reserved. This program and the accompanying materials +## are made available under the terms of the Apache License, Version 2.0 +## which accompanies this distribution, and is available at +## http://www.apache.org/licenses/LICENSE-2.0 +############################################################################### + nodes: - name: node1 tags: control #optional param, other valid value "compute" diff --git a/docs/labs/zte-sh-lab/pod2_description.rst b/docs/labs/zte-sh-lab/pod-2.rst index 961aa2a0..961aa2a0 100644 --- a/docs/labs/zte-sh-lab/pod2_description.rst +++ b/docs/labs/zte-sh-lab/pod-2.rst diff --git a/docs/labs/zte-sh-lab/pod2_inventory.yaml b/docs/labs/zte-sh-lab/pod-2.yaml index a49ac190..55d478fd 100644 --- a/docs/labs/zte-sh-lab/pod2_inventory.yaml +++ b/docs/labs/zte-sh-lab/pod-2.yaml @@ -1,3 +1,12 @@ +############################################################################## +## Copyright (c) 2015 ZTE Corp. and others. +## +## All rights reserved. This program and the accompanying materials +## are made available under the terms of the Apache License, Version 2.0 +## which accompanies this distribution, and is available at +## http://www.apache.org/licenses/LICENSE-2.0 +############################################################################### + nodes: - name: node1 tags: control #optional param, other valid value "compute" diff --git a/docs/labs/zte-sh-lab/pod3_description.rst b/docs/labs/zte-sh-lab/pod-3.rst index f0cfae7b..f0cfae7b 100644 --- a/docs/labs/zte-sh-lab/pod3_description.rst +++ b/docs/labs/zte-sh-lab/pod-3.rst diff --git a/docs/labs/zte-sh-lab/pod3_inventory.yaml b/docs/labs/zte-sh-lab/pod-3.yaml index 061c07cb..e3557fc2 100644 --- a/docs/labs/zte-sh-lab/pod3_inventory.yaml +++ b/docs/labs/zte-sh-lab/pod-3.yaml @@ -1,3 +1,12 @@ +############################################################################## +## Copyright (c) 2015 ZTE Corp. and others. +## +## All rights reserved. This program and the accompanying materials +## are made available under the terms of the Apache License, Version 2.0 +## which accompanies this distribution, and is available at +## http://www.apache.org/licenses/LICENSE-2.0 +############################################################################### + nodes: - name: node1 tags: control diff --git a/docs/specification/hardwarespec.rst b/docs/specification/hardwarespec.rst index 28165ebf..8086aa91 100644 --- a/docs/specification/hardwarespec.rst +++ b/docs/specification/hardwarespec.rst @@ -23,6 +23,12 @@ http://artifacts.opnfv.org/brahmaputra.1.0/docs/opnfv-jenkins-slave-connection.b **CPU:** * Intel Xeon E5-2600v2 Series or newer +* AArch64 (64bit ARM architecture) compatible (ARMv8 or newer) + +**Firmware:** + +* BIOS/EFI compatible for x86-family blades +* EFI compatible for AArch64 blades **Local Storage:** diff --git a/docs/specification/pharosspec.rst b/docs/specification/index.rst index c3eb45a7..c3eb45a7 100644 --- a/docs/specification/pharosspec.rst +++ b/docs/specification/index.rst |
