Merge "add eNB installation draft"
diff --git a/pronto_deployment_guide/acceptance_test_specification.rst b/pronto_deployment_guide/acceptance_test_specification.rst
index dffff4f..da12424 100644
--- a/pronto_deployment_guide/acceptance_test_specification.rst
+++ b/pronto_deployment_guide/acceptance_test_specification.rst
@@ -38,7 +38,7 @@
|1. Access to the eNB* (through SSH or Web GUI)|Able to get ICMP reply(PING reply) |
| |from the GCP node. |
| | |
-|2. Ping to "10.168.0.204" eNB S1-MME/S1-C |( )YES ( )NO |
+|2. Ping to "10.168.0.6" eNB S1-MME/S1-C |( )YES ( )NO |
| interface IP address* | |
| |Comments: |
+----------------------------------------------+------------------------------------+
@@ -60,7 +60,7 @@
|1. Access to the eNB* (through SSH or Web GUI)|Able to get ICMP reply(PING reply) |
| |from the GCP node. |
| | |
-|2. Ping to "10.168.0.204" |( )YES ( )NO |
+|2. Ping to "10.168.0.6" |( )YES ( )NO |
| | |
| |Comments: |
+----------------------------------------------+------------------------------------+
diff --git a/pronto_deployment_guide/run_time_deployment.rst b/pronto_deployment_guide/run_time_deployment.rst
index 9bee2da..e465dac 100644
--- a/pronto_deployment_guide/run_time_deployment.rst
+++ b/pronto_deployment_guide/run_time_deployment.rst
@@ -158,6 +158,7 @@
$ cd $WORKDIR/aether-pod-configs/production
$ mkdir ace-new && cd ace-new
$ ln -s ../../common/ace-custom/* .
+ $ ln -s ../../common/alerts/alerts.tf .
$ export CLUSTER_NAME=ace-new
$ export CLUSTER_DOMAIN=prd.new.aetherproject.net
@@ -167,10 +168,10 @@
# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
terraform {
- backend "gcs" {
- bucket = "aether-terraform-bucket"
- prefix = "product/${CLUSTER_NAME}"
- }
+ backend "gcs" {
+ bucket = "aether-terraform-bucket"
+ prefix = "product/${CLUSTER_NAME}"
+ }
}
EOF
@@ -204,44 +205,44 @@
cluster_name = "ace-new"
cluster_admin = "new_admin"
cluster_nodes = {
- new-prd-leaf1 = {
- user = "root"
- private_key = "~/.ssh/id_rsa_terraform"
- host = "10.94.1.3"
- roles = ["worker"]
- labels = ["node-role.aetherproject.org=switch"]
- taints = ["node-role.aetherproject.org=switch:NoSchedule"]
- },
- new-server-1 = {
- user = "terraform"
- private_key = "~/.ssh/id_rsa_terraform"
- host = "10.94.1.3"
- roles = ["etcd", "controlplane", "worker"]
- labels = []
- taints = []
- },
- new-server-2 = {
- user = "terraform"
- private_key = "~/.ssh/id_rsa_terraform"
- host = "10.94.1.4"
- roles = ["etcd", "controlplane", "worker"]
- labels = []
- taints = []
- },
- new-server-3 = {
- user = "terraform"
- private_key = "~/.ssh/id_rsa_terraform"
- host = "10.94.1.5"
- roles = ["etcd", "controlplane", "worker"]
- labels = []
- taints = []
- }
+ new-prd-leaf1 = {
+ user = "root"
+ private_key = "~/.ssh/id_rsa_terraform"
+ host = "10.94.1.3"
+ roles = ["worker"]
+ labels = ["node-role.aetherproject.org=switch"]
+ taints = ["node-role.aetherproject.org=switch:NoSchedule"]
+ },
+ new-server-1 = {
+ user = "terraform"
+ private_key = "~/.ssh/id_rsa_terraform"
+ host = "10.94.1.3"
+ roles = ["etcd", "controlplane", "worker"]
+ labels = []
+ taints = []
+ },
+ new-server-2 = {
+ user = "terraform"
+ private_key = "~/.ssh/id_rsa_terraform"
+ host = "10.94.1.4"
+ roles = ["etcd", "controlplane", "worker"]
+ labels = []
+ taints = []
+ },
+ new-server-3 = {
+ user = "terraform"
+ private_key = "~/.ssh/id_rsa_terraform"
+ host = "10.94.1.5"
+ roles = ["etcd", "controlplane", "worker"]
+ labels = []
+ taints = []
+ }
}
projects = [
- "system_apps",
- "connectivity_edge_up4",
- "edge_apps"
+ "system_apps",
+ "connectivity_edge_up4",
+ "edge_apps"
]
Lastly, we will create a couple of overriding values files for the managed applications,
@@ -263,35 +264,35 @@
serviceType: ClusterIP
service:
- clusterIP: ${UE_DNS}
+ clusterIP: ${UE_DNS}
servers:
- zones:
- - zone: .
- port: 53
- plugins:
- - name: errors
- - name: health
- configBlock: |-
+ - zone: .
+ port: 53
+ plugins:
+ - name: errors
+ - name: health
+ configBlock: |-
lameduck 5s
- - name: ready
- - name: prometheus
- parameters: 0.0.0.0:9153
- - name: forward
- parameters: . /etc/resolv.conf
- - name: cache
- parameters: 30
- - name: loop
- - name: reload
- - name: loadbalance
+ - name: ready
+ - name: prometheus
+ parameters: 0.0.0.0:9153
+ - name: forward
+ parameters: . /etc/resolv.conf
+ - name: cache
+ parameters: 30
+ - name: loop
+ - name: reload
+ - name: loadbalance
- zones:
- - zone: apps.svc.${CLUSTER_DOMAIN}
- port: 53
- plugins:
- - name: errors
- - name: forward
- parameters: . ${K8S_DNS}
- - name: cache
- parameters: 30
+ - zone: apps.svc.${CLUSTER_DOMAIN}
+ port: 53
+ plugins:
+ - name: errors
+ - name: forward
+ parameters: . ${K8S_DNS}
+ - name: cache
+ parameters: 30
EOF
# Create PFCP agent overriding values file
@@ -299,11 +300,11 @@
# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
config:
- pfcp:
- cfgFiles:
+ pfcp:
+ cfgFiles:
upf.json:
- p4rtciface:
- p4rtc_server: "onos-tost-onos-classic-hs.tost.svc.${CLUSTER_DOMAIN}"
+ p4rtciface:
+ p4rtc_server: "onos-tost-onos-classic-hs.tost.svc.${CLUSTER_DOMAIN}"
EOF
Make sure the ace-new directory has all necessary files and before a review request.
diff --git a/pronto_deployment_guide/tost_deployment.rst b/pronto_deployment_guide/tost_deployment.rst
index eb90415..12acef4 100644
--- a/pronto_deployment_guide/tost_deployment.rst
+++ b/pronto_deployment_guide/tost_deployment.rst
@@ -62,37 +62,22 @@
Terraform reads **app_map.tfvars** to know which application will be installed on Rancher
and which version and customized values need to apply to.
-Here is the example of **app_map.tfvars** which is used to install the **hostpath** storage.
-We specify the Helm Chart version to **0.2.9** and use the file **hostpath.yaml** as the custom values
+Here is the example of **app_map.tfvars** which defines prerequisite apps for TOST
+as well as project and namespace in which TOST apps will be provisioned.
+Note that currently we don't have any prerequisite so we left this blank intentionally.
+It can be used to specify prerequisites in the future.
.. code-block::
project_name = "tost"
namespace_name = "tost"
- app_map = {
- hostpath-provisioner = {
- app_name = "hostpath-provisioner"
- target_namespace = "tost"
- catalog_name = "rimusz"
- template_name = "hostpath-provisioner"
- template_version = "0.2.9"
- values_yaml = ["hostpath.yaml"]
- }
- }
-
-The content of **hostpath.yaml** looks like below.
-It follows the standard yaml format and we use this file to customize the **hostpath** Helm Chart.
-
-.. code-block::
-
- storageClass:
- name: fast-disks
+ app_map = {}
ONOS folder
^^^^^^^^^^^
All files under **onos** directory are related to ONOS application.
-As we mentioned above, the **app_map.tfvars** describe the information about ONOS helm chart.
+The **app_map.tfvars** in this folder describes the information about ONOS helm chart.
In this example, we specify the **onos-tost** helm chart version to **0.1.18** and load **onos.yaml**
as custom value files.