summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/BuildGuide.rst35
-rw-r--r--docs/InstallGuide.rst95
2 files changed, 61 insertions, 69 deletions
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index 8564a360..798da9f9 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -121,24 +121,7 @@ Following steps are still required and are not supported by current version of d
./build/creating_data/create_nginx_image/01create-image.sh /tmp/resources/offline_data/docker_images_infra
-**Step 3 - Http files**
-
-ToDo: complete and verified list of http files will come just during/after vFWCL testcase
-
-
-**Step 4 - Binaries**
-
-::
-
- # Binaries are downloaded in step one but some post processing is still needed.
- # This will be improved in future in installer itself
-
- tar -xf ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz linux-amd64/helm -O > ../resources/downloads/helm
- rm -f ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz
- mv ../resources/downloads/rke_linux-amd64 rke
-
-
-**Step 5 - Create repo**
+**Step 3 - Create repo**
::
@@ -292,28 +275,22 @@ Appendix 1. Step-by-step download procedure
# Following step will download all git repos
./build/download/download.py --git ./build/data_lists/onap_git_repos.list ../resources/git-repo
-**Step 4 - http files**
-
-ToDo: complete and verified list of http files will come just during/after vFWCL testcase
-**Step 5 - npm packages**
+**Step 4 - npm packages**
::
# Following step will download all npm packages
./build/download/download.py --npm ./build/data_lists/onap_npm.list ../resources/offline_data/npm_tar
-**Step 6 - binaries**
+**Step 5 - binaries**
::
- # Following step will download and prepare rke, kubectl and helm binaries
+ # Following step will download rke, kubectl and helm binaries
./build/download/download.py --http ./build/data_lists/infra_bin_utils.sh ../resources/downloads
- tar -xf ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz linux-amd64/helm -O > ../resources/downloads/helm
- rm -f ../resources/downloads/helm-v2.12.3-linux-amd64.tar.gz
- mv ../resources/downloads/rke_linux-amd64 rke
-**Step 7 - rpms**
+**Step 6 - rpms**
::
@@ -322,7 +299,7 @@ ToDo: complete and verified list of http files will come just during/after vFWCL
createrepo ../resources/pkg/rhel
-**Step 8 - pip packages**
+**Step 7 - pip packages**
::
diff --git a/docs/InstallGuide.rst b/docs/InstallGuide.rst
index 95b5749f..7e8ebf04 100644
--- a/docs/InstallGuide.rst
+++ b/docs/InstallGuide.rst
@@ -168,20 +168,29 @@ We need to setup the ``'hosts.yml'`` first, the template looks like this::
# This is group of hosts which are/will be part of Kubernetes cluster.
kubernetes:
- hosts:
- kubernetes-node-1:
- ansible_host: 10.8.8.19
- #ip of the node that it uses for communication with k8s cluster.
- cluster_ip: 10.8.8.19
-
- # This is a group of hosts that are to be used as kubernetes control plane nodes.
- # This means they host kubernetes api server, controller manager and scheduler.
- # This example uses infra for this purpose, however note that any
- # other host could be used including kubernetes nodes.
- # cluster_ip needs to be set for hosts used as control planes.
- kubernetes-control-plane:
- hosts:
- infrastructure-server
+ children:
+ # This is a group of hosts containing kubernetes worker nodes.
+ kubernetes-node:
+ hosts:
+ kubernetes-node-1:
+ ansible_host: 10.8.8.19
+ #ip of the node that it uses for communication with k8s cluster.
+ cluster_ip: 10.8.8.19
+
+ # Group of hosts containing etcd cluster nodes.
+ # Defaults to infra.
+ kubernetes-etcd:
+ hosts:
+ infrastructure-server
+
+ # This is a group of hosts that are to be used as kubernetes control plane nodes.
+ # This means they host kubernetes api server, controller manager and scheduler.
+ # This example uses infra for this purpose, however note that any
+ # other host could be used including kubernetes nodes.
+ # cluster_ip needs to be set for hosts used as control planes.
+ kubernetes-control-plane:
+ hosts:
+ infrastructure-server
nfs-server:
hosts:
@@ -222,37 +231,43 @@ After all the changes, the ``'hosts.yml'`` should look similar to this::
infrastructure:
hosts:
infrastructure-server:
- ansible_host: 10.8.8.100
+ ansible_host: 10.8.8.13
#IP used for communication between infra and kubernetes nodes, must be specified.
cluster_ip: 10.8.8.100
# This is group of hosts which are/will be part of Kubernetes cluster.
kubernetes:
- hosts:
- kubernetes-node-1:
- ansible_host: 10.8.8.101
- #ip of the node that it uses for communication with k8s cluster.
- cluster_ip: 10.8.8.101
- kubernetes-node-2:
- ansible_host: 10.8.8.102
- #ip of the node that it uses for communication with k8s cluster.
- cluster_ip: 10.8.8.102
- kubernetes-node-3:
- ansible_host: 10.8.8.103
- #ip of the node that it uses for communication with k8s cluster.
- cluster_ip: 10.8.8.103
-
- # This is a group of hosts that are to be used as kubernetes control plane nodes.
- # This means they host kubernetes api server, controller manager and scheduler.
- # This example uses infra for this purpose, however note that any
- # other host could be used including kubernetes nodes.
- # cluster_ip needs to be set for hosts used as control planes.
- kubernetes-control-plane:
- hosts:
- infrastructure-server
- ansible_host: 10.8.8.100
- #IP used for communication between infra and kubernetes nodes, must be specified.
- cluster_ip: 10.8.8.100
+ children:
+ # This is a group of hosts containing kubernetes worker nodes.
+ kubernetes-node:
+ hosts:
+ kubernetes-node-1:
+ ansible_host: 10.8.8.101
+ #ip of the node that it uses for communication with k8s cluster.
+ cluster_ip: 10.8.8.101
+ kubernetes-node-2:
+ ansible_host: 10.8.8.102
+ #ip of the node that it uses for communication with k8s cluster.
+ cluster_ip: 10.8.8.102
+ kubernetes-node-3:
+ ansible_host: 10.8.8.103
+ #ip of the node that it uses for communication with k8s cluster.
+ cluster_ip: 10.8.8.103
+
+ # Group of hosts containing etcd cluster nodes.
+ # Defaults to infra.
+ kubernetes-etcd:
+ hosts:
+ infrastructure-server
+
+ # This is a group of hosts that are to be used as kubernetes control plane nodes.
+ # This means they host kubernetes api server, controller manager and scheduler.
+ # This example uses infra for this purpose, however note that any
+ # other host could be used including kubernetes nodes.
+ # cluster_ip needs to be set for hosts used as control planes.
+ kubernetes-control-plane:
+ hosts:
+ infrastructure-server
nfs-server:
hosts: