summaryrefslogtreecommitdiffstats
path: root/docs/infrastructure
diff options
context:
space:
mode:
Diffstat (limited to 'docs/infrastructure')
-rw-r--r--docs/infrastructure/ci.rst4
-rw-r--r--docs/infrastructure/gce-machines.rst131
-rw-r--r--docs/infrastructure/hardware-infrastructure.rst11
-rw-r--r--docs/infrastructure/overview.rst60
-rw-r--r--docs/infrastructure/software-infrastructure.rst11
-rw-r--r--docs/infrastructure/xci.rst16
6 files changed, 159 insertions, 74 deletions
diff --git a/docs/infrastructure/ci.rst b/docs/infrastructure/ci.rst
index a6323ef76..97429a505 100644
--- a/docs/infrastructure/ci.rst
+++ b/docs/infrastructure/ci.rst
@@ -10,5 +10,5 @@ Continuous Integration - CI
Please see the details of CI from the chapters below.
-- :ref:`CI Overview <ci-overview>`
-- :ref:`CI User Guide <ci-user-guide>`
+- :ref:`CI Overview <releng:ci-overview>`
+- :ref:`CI User Guide <releng:ci-user-guide>`
diff --git a/docs/infrastructure/gce-machines.rst b/docs/infrastructure/gce-machines.rst
new file mode 100644
index 000000000..901b1750c
--- /dev/null
+++ b/docs/infrastructure/gce-machines.rst
@@ -0,0 +1,131 @@
+==================
+OPNFV-GCE-MACHINES
+==================
+
+code-block:: yaml
+
+ hosts:
+ gce-opnfv-jenkins-2:
+ location: us-central1-a
+ flavor: n1-standard-4
+ purpose: 'main jenkins server'
+ network: gce-wl
+ contact: 'opnfv-helpdesk@rt.linuxfoundation.org'
+ gce-opnfv-jenkins-dev-1:
+ location: us-central1-a
+ flavor: n1-standard-2
+ purpose: 'main sandbox server'
+ network: gce-wl
+ contact: 'opnfv-helpdesk@rt.linuxfoundation.org'
+ gce-opnfv-jenkins-dev-build-1:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'static centos builder'
+ network: opnfv-sandbox
+ contact: 'opnfv-helpdesk@rt.linuxfoundation.org'
+ gce-opnfv-jenkins-dev-build-2-ubuntu:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'static ubuntu builder'
+ network: opnfv-sandbox
+ contact: 'opnfv-helpdesk@rt.linuxfoundation.org'
+ gce-opnfv-nginx-1:
+ location: us-central1-a
+ flavor: n1-highcpu-2
+ purpose: 'main load balancer'
+ network: gce-wl
+ contact: 'opnfv-helpdesk@rt.linuxfoundation.org'
+ gce-wl-openvpn:
+ location: us-central1-a
+ flavor: g1-small
+ purpose: 'vpn bridge'
+ network: gce-wl
+ contact: 'opnfv-helpdesk@rt.linuxfoundation.org'
+ gke-cluster-1-bamboo-gke-default-pool-76eef41f-dvfd:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'kubernetes cluster'
+ contact: 'chu.wenjing@gmail.com'
+ gke-cluster-1-bamboo-gke-default-pool-76eef41f-fnt7:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'kubernetes cluster'
+ contact: 'chu.wenjing@gmail.com'
+ gke-cluster-1-bamboo-gke-default-pool-76eef41f-m798:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'kubernetes cluster'
+ contact: 'chu.wenjing@gmail.com'
+ gke-cluster-1-bamboo-gke-default-pool-76eef41f-w5h8:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'kubernetes cluster'
+ contact: 'chu.wenjing@gmail.com'
+ gke-cluster-1-bamboo-gke-default-pool-76eef41f-wjs5:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'kubernetes cluster'
+ contact: 'chu.wenjing@gmail.com'
+ gke-cluster-1-bamboo-gke-default-pool-76eef41f-znj9:
+ location: us-central1-a
+ flavor: n1-standard-1
+ purpose: 'kubernetes cluster'
+ contact: 'chu.wenjing@gmail.com'
+ gce-opnfv-cvp:
+ location: us-central1-c
+ flavor: n1-standard-2
+ purpose: 'verified.opnfv.org'
+ contact: 'eddie.arrage@huawei.com'
+ network: opnfv-sandbox
+ gce-opnfv-discourse-ash-1:
+ location: us-central1-f
+ flavor: n1-standard-1
+ purpose: 'techdiscuss.opnfv.org'
+ contact: 'ashleeyoung@huawei.com'
+ network: opnfv-sandbox
+ gce-opnfv-influxdb-fbrockners:
+ location: us-central1-f
+ flavor: n1-standard-1
+ purpose: 'testresults.opnfv.org database server'
+ contact: 'feng.xiaowei@zte.com.cn'
+ network: opnfv-sandbox
+ gce-opnfv-pharos-dashboard:
+ location: us-central1-f
+ flavor: n1-standard-1
+ purpose: 'labs.opnfv.org'
+ contact: 'pberberian@iol.unh.edu'
+ network: opnfv-sandbox
+ gce-opnfv-plugfest-influxdb-fbrockners-1:
+ location: us-central1-f
+ flavor: n1-standard-1
+ purpose: 'Plugfest only testresults database server'
+ contact: 'feng.xiaowei@zte.com.cn'
+ network: opnfv-sandbox
+ gce-opnfv-plugfest-sandbox-fbrockners-1:
+ location: us-central1-f
+ flavor: n1-standard-2
+ purpose: 'Plugfest only testresults server'
+ contact: 'feng.xiaowei@zte.com.cn'
+ network: opnfv-sandbox
+ gce-opnfv-sandbox-fbrockners:
+ location: us-central1-f
+ flavor: n1-standard-2
+ purpose: 'testresults.opnfv.org'
+ contact: 'feng.xiaowei@zte.com.cn'
+ network: opnfv-sandbox
+ gce-opnfv-vnf-opnfv-org:
+ location: us-central1-f
+ flavor: n1-standard-1
+ purpose: 'vnf.opnfv.org'
+ contact: 'shailrishabh@gmail.com'
+ network: opnfv-sandbox
+ zuul-test-machine:
+ location: us-central1-f
+ flavor: n1-standard-4
+ purpose: 'Technology test macine'
+ contact: 'fatih.degirmenci@ericsson.com'
+ network: opnfv-sandbox
+ gce-korg-lkml-public-inbox:
+ location: us-west1-b
+ flavor: n1-standard-4
+ purpose: 'This is not an OPNFV resource'
diff --git a/docs/infrastructure/hardware-infrastructure.rst b/docs/infrastructure/hardware-infrastructure.rst
deleted file mode 100644
index f800cdb05..000000000
--- a/docs/infrastructure/hardware-infrastructure.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. _hardware-infrastructure:
-
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. SPDX-License-Identifier: CC-BY-4.0
-.. (c) Open Platform for NFV Project, Inc. and its contributors
-
-=======================
-Hardware Infrastructure
-=======================
-
-TBD
diff --git a/docs/infrastructure/overview.rst b/docs/infrastructure/overview.rst
index 1bd792000..ed4dc11d9 100644
--- a/docs/infrastructure/overview.rst
+++ b/docs/infrastructure/overview.rst
@@ -8,48 +8,40 @@
Infrastructure Overview
=======================
-OPNFV develops, operates, and maintains infrastructure which is used by the OPNFV
-Community for development, integration, and testing purposes. `OPNFV
-Infrastructure Working Group (Infra WG) <https://wiki.opnfv.org/display/INF>`_
-oversees the OPNFV Infrastructure, ensures it is kept in a state which serves
-the community in best possible way and always up to date.
-
-Infra WG is working towards a model whereby we have a seamless pipeline
-for handing resource requests from the OPNFV community for both development and
+Anuket develops, operates, and maintains infrastructure which is used by the Anuket
+Community for development, integration, and testing purposes.
+
+Anuket is working towards a model whereby we have a seamless pipeline
+for handing resource requests from the Anuket community for both development and
Continuous Integration perspectives. Automation of requests and integration to
-existing automation tools is a primary driver in reaching this model. In the
-Infra WG, we imagine a model where the Infrastructure Requirements that are
-specified by a Feature, Installer or otherrelevant projects within OPNFV are
+existing automation tools is a primary driver in reaching this model. In Anuket,
+we imagine a model where the Infrastructure Requirements that are
+specified by a Feature, Installer or otherrelevant projects within Anuket are
requested, provisioned, used, reported on and subsequently torn down with no (or
minimal) user intervention at the physical/infrastructure level.
-Objectives of the Infra WG are
-
-* Deliver efficiently dimensions resources to OPNFV community needs on request in a timely manner that ensure maximum usage (capacity) and maximum density (distribution of workloads)
-* Satisfy the needs of the twice-yearly release projects, this includes being able to handle load (amount of projects and requests) as well as need (topology and different layouts)
-* Support OPNFV community users. As the INFRA group, we are integral to all aspects of the OPNFV Community (since it starts with the Hardware) - this can mean troubleshooting any element within the stack
-* Provide a method to expand and adapt as OPNFV community needs grow and provide this to Hosting Providers (lab providers) for input in growth forecast so they can better judge how best to contribute with their resources.
-* Work with reporting and other groups to ensure we have adequate feedback to the end-users of the labs on how their systems, code, feature performs.
+Objectives of Anuket are
-The details of what is provided as part of the infrastructure can be seen in following chapters.
+* Deliver efficiently dimensions resources to Anuket community needs on request
+ in a timely manner that ensure maximum usage (capacity) and maximum density
+ (distribution of workloads)
+* Satisfy the needs of the twice-yearly release projects, this includes being
+ able to handle load (amount of projects and requests) as well as need
+ (topology and different layouts)
+* Support Anuket community users. As the INFRA group, we are integral to all
+ aspects of the Anuket Community (since it starts with the Hardware) - this
+ can mean troubleshooting any element within the stack
+* Provide a method to expand and adapt as Anuket community needs grow and
+ provide this to Hosting Providers (lab providers) for input in growth
+ forecast so they can better judge how best to contribute with their resources.
+* Work with reporting and other groups to ensure we have adequate feedback to
+ the end-users of the labs on how their systems, code, feature performs.
-Hardware Infrastructure
------------------------
+The details of what is provided as part of the infrastructure can be seen in
+following chapters.
-TBD
Software Infrastructure
-----------------------
-.. toctree::
- :maxdepth: 1
-
- ../submodules/releng/docs/infra/index
-
-Security
---------
-
-.. toctree::
- :maxdepth: 1
-
- ../submodules/releng-anteater/docs/index
+- :ref:`releng:software-infrastructure`
diff --git a/docs/infrastructure/software-infrastructure.rst b/docs/infrastructure/software-infrastructure.rst
deleted file mode 100644
index 5c7158316..000000000
--- a/docs/infrastructure/software-infrastructure.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-.. _software-infrastructure:
-
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. SPDX-License-Identifier: CC-BY-4.0
-.. (c) Open Platform for NFV Project, Inc. and its contributors
-
-=======================
-Software Infrastructure
-=======================
-
-TBD
diff --git a/docs/infrastructure/xci.rst b/docs/infrastructure/xci.rst
deleted file mode 100644
index fe4eaf9de..000000000
--- a/docs/infrastructure/xci.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-.. _xci:
-
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. SPDX-License-Identifier: CC-BY-4.0
-.. (c) Open Platform for NFV Project, Inc. and its contributors
-
-============================================
-Cross Community Continuous Integration - XCI
-============================================
-
-Please see the details of XCI from the chapters below.
-
-- :ref:`XCI Overview <xci-overview>`
-- :ref:`XCI Way of Working <xci-wow>`
-- :ref:`XCI Sandbox and User Guide <xci-user-guide>`
-- :ref:`XCI Developer Guide <xci-developer-guide>`