summaryrefslogtreecommitdiffstats
path: root/docs/release/userguide
diff options
context:
space:
mode:
Diffstat (limited to 'docs/release/userguide')
-rw-r--r--docs/release/userguide/index.rst11
-rw-r--r--docs/release/userguide/kata.rst17
-rw-r--r--docs/release/userguide/virlet.rst13
3 files changed, 4 insertions, 37 deletions
diff --git a/docs/release/userguide/index.rst b/docs/release/userguide/index.rst
index cf244e1..f2149b0 100644
--- a/docs/release/userguide/index.rst
+++ b/docs/release/userguide/index.rst
@@ -2,14 +2,11 @@
.. License. http://creativecommons.org/licenses/by/4.0
.. (c) Xuan Jia (China Mobile)
-==========================
-Container4NFV User Guide
-==========================
-
-:Project: Container4NFV, https://wiki.opnfv.org/display/openretriever
+.. _container4nfv-userguide:
-:Editors: Xuan Jia (China Mobile)
-:Authors: Xuan Jia (China Mobile)
+========================
+Container4NFV User Guide
+========================
.. toctree::
:maxdepth: 3
diff --git a/docs/release/userguide/kata.rst b/docs/release/userguide/kata.rst
deleted file mode 100644
index c7e6340..0000000
--- a/docs/release/userguide/kata.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-Kata Containers implementation for OPNFV
-========================================
-
-Kata Containers is a new open source project building extremely lightweight virtual machines that seamlessly plug into the containers ecosystem.
-
-CONTAINER4NFV setup a Kubernetes cluster on VMs running with Vagrant and kubeadm.
-
-kubeadm assumes you have a set of machines (virtual or bare metal) that are up and running. In this way we can get a cluster with one master node and 2 workers (default). If you want to increase the number of workers nodes, please check the Vagrantfile inside the project.
-
-About Kata Containers
----------------------
-
-[Kata Containers](https://katacontainers.io/) is an open source project and community working to build a standard implementation of lightweight Virtual Machines (VMs) that feel and perform like containers, but provide the workload isolation and security advantages of VMs.
-
-The Kata Containers project will initially comprise six components, including the Agent, Runtime, Proxy, Shim, Kernel and packaging of QEMU 2.9. It is designed to be architecture agnostic, run on multiple hypervisors and be compatible with the OCI specification for Docker containers and CRI for Kubernetes.
-
-Kata Containers combines technology from Intel Clear Containers and Hyper runV. The code is hosted on Github under the Apache 2 license and the project is managed by the OpenStack Foundation.
diff --git a/docs/release/userguide/virlet.rst b/docs/release/userguide/virlet.rst
deleted file mode 100644
index 60902db..0000000
--- a/docs/release/userguide/virlet.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Virlet implementation for OPNFV
-=================================
-
-This quickstart shows you how to easily install a Kubernetes cluster on VMs running with Vagrant. The installation uses a tool called kubeadm which is part of Kubernetes.
-
-kubeadm assumes you have a set of machines (virtual or bare metal) that are up and running. In this way we can get a cluster with one master node and 2 workers (default). If you want to increase the number of workers nodes, please check the Vagrantfile inside the project.
-
-About Virlet
-------------
-
-(Virlet)[https://github.com/Mirantis/virtlet] is a Kubernetes runtime server / (CRI)[http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html] that enables you to run VM workloads based on QCOW2 images. (CRI is what enables Kubernetes to run non-Docker flavors of containers, such as Rkt.)
-
-Virlet gives NFV a new direction. Virtlet itself runs as a DaemonSet, essentially acting as a hypervisor and making the CRI proxy available to run the actual VMs. This way, it’s possible to have both Docker and non-Docker pods run on the same node.