Merge "Clarify openstack-helm and VTN requirements"
diff --git a/Makefile b/Makefile
index c477978..4c5d630 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
build: setup
gitbook build
-setup: automation-tools cord-tester openstack fabric hippie-oss kubernetes-service olt-service openolt rcord vrouter xos xos-gui xos-tosca swagger $(GENERATED_DOCS)
+setup: automation-tools cord-tester openstack fabric hippie-oss kubernetes-service olt-service onos-service openolt rcord vrouter xos xos-gui xos-tosca swagger $(GENERATED_DOCS)
gitbook init
gitbook install
@@ -53,6 +53,9 @@
olt-service:
ln -s ../orchestration/xos_services/olt-service/docs olt-service
+onos-service:
+ ln -s ../orchestration/xos_services/onos-service/docs onos-service
+
kubernetes-service:
ln -s ../orchestration/xos_services/kubernetes-service/docs kubernetes-service
@@ -84,4 +87,4 @@
rm -rf $(GENERATED_DOCS)
rm -rf _book
rm -rf node_modules
- rm -rf openstack automation-tools cord-tester fabric hippie-oss kubernetes-service olt-service openolt rcord vrouter test xos xos-gui xos-tosca
+ rm -rf openstack automation-tools cord-tester fabric hippie-oss kubernetes-service olt-service onos-service openolt rcord vrouter test xos xos-gui xos-tosca
diff --git a/SUMMARY.md b/SUMMARY.md
index dce2483..03a6ffa 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -39,6 +39,8 @@
* [M-CORD](profiles/mcord/configuration.md)
* [Configuring Services](operating_cord/services.md)
* [Fabric](fabric/README.md)
+ * [ONOS](onos-service/README.md)
+ * [vOLT](olt-service/README.md)
* [vRouter](vrouter/README.md)
* [Modeling Guide](xos/README.md)
* [XOS Modeling Framework](xos/dev/xproto.md)
diff --git a/profiles/rcord/configuration.md b/profiles/rcord/configuration.md
index e321692..d0ff9af 100644
--- a/profiles/rcord/configuration.md
+++ b/profiles/rcord/configuration.md
@@ -105,7 +105,6 @@
olt_device:
type: tosca.nodes.OLTDevice
properties:
- dp_id: of:0000deadbeeffeed
name: volt-1
device_type: openolt
host: 10.90.0.114
@@ -113,6 +112,7 @@
switch_datapath_id: of:0000000000000001
switch_port: "1"
outer_tpid: "0x8100"
+ uplink: "128"
requirements:
- volt_service:
node: service#volt
@@ -313,26 +313,3 @@
```
_For instructions on how to push TOSCA, please refer to this [guide](../../xos-tosca/README.md)_
-
-**Configure onos-voltha to connect to the Kafka bus**
-
-Copy this in a `kafka-config.json` file:
-
-```json
-{
- "apps" : {
- "org.opencord.olt" : {
- "kafka" : {
- "bootstrapServers" : "cord-kafka-kafka.default.svc.cluster.local:9092"
- }
- }
- }
-}
-```
-
-Send this config to `onos-voltha` using this command:
-```shell
-curl --user karaf:karaf -X POST -H "Content-Type: application/json" --data @kafka-config.json http://$node:$port/onos/v1/network/configuration/
-```
-
-To find out what ports `onos-voltha` is using, please refer to the [chart](../../charts/onos.md#onos-voltha).