Merge "Fix Kubespray installation docs"
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..598619f 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -39,6 +39,9 @@
* [M-CORD](profiles/mcord/configuration.md)
* [Configuring Services](operating_cord/services.md)
* [Fabric](fabric/README.md)
+ * [ONOS](onos-service/README.md)
+ * [RCORD](rcord/README.md)
+ * [vOLT](olt-service/README.md)
* [vRouter](vrouter/README.md)
* [Modeling Guide](xos/README.md)
* [XOS Modeling Framework](xos/dev/xproto.md)
@@ -69,4 +72,3 @@
* [Test Setup](cord-tester/qa_testsetup.md)
* [Test Environment](cord-tester/qa_testenv.md)
* [System Tests](cord-tester/validate_pods.md)
-
diff --git a/prereqs/vtn-setup.md b/prereqs/vtn-setup.md
index d523c3b..e5ff99b 100644
--- a/prereqs/vtn-setup.md
+++ b/prereqs/vtn-setup.md
@@ -22,7 +22,7 @@
cp ~/.ssh/id_rsa xos-profiles/base-openstack/files/node_key
```
-The VTN app requires a fabric interface on the compute nodes. VTN will not successfully initialize if this interface is not present. By default the name of this interface is expected to be named `fabric`. If there is not an actual fabric interface on the compute node, create a dummy interface as follows:
+Second, the VTN app requires a fabric interface on the compute nodes. VTN will not successfully initialize if this interface is not present. By default the name of this interface is expected to be named `fabric`. If there is not an actual fabric interface on the compute node, create a dummy interface as follows:
```shell
sudo modprobe dummy
@@ -30,14 +30,22 @@
sudo ifconfig fabric up
```
-Finally, on each compute node, Open vSwitch must be configured to listen for
-remote connections so that it can be controlled by VTN. Example:
+Finally, in order to be added to the VTN configuration, each compute node must
+be resolvable in DNS. If a server's hostname is not resolvable, it can be
+added to the local `kube-dns` server (substitute _HOSTNAME_ with the output of
+the `hostname` command, and _HOST-IP-ADDRESS_ with the node's primary IP
+address):
```shell
-PODS=$( kubectl get pod --namespace openstack|grep openvswitch-db|awk '{print $1}' )
-for POD in $PODS
-do
- kubectl --namespace openstack exec "$POD" \
- -- ovs-appctl -t ovsdb-server ovsdb-server/add-remote ptcp:6641
-done
+cat <<EOF > /tmp/HOSTNAME-dns.yaml
+kind: Service
+apiVersion: v1
+metadata:
+ name: HOSTNAME
+ namespace: default
+spec:
+ type: ExternalName
+ externalName: HOST-IP-ADDRESS
+EOF
+kubectl create -f /tmp/HOSTNAME-dns.yaml
```
diff --git a/profiles/mcord/install.md b/profiles/mcord/install.md
index 89bbb76..3fda193 100644
--- a/profiles/mcord/install.md
+++ b/profiles/mcord/install.md
@@ -5,9 +5,8 @@
A convenience script is provided that will install M-CORD on a single
node, suitable for evaluation or testing. Requirements:
-- An Ubuntu 16.04 node with at least 64GB of RAM and 32 virtual CPUs
+- An _Ubuntu 16.04.4 LTS_ server with at least 64GB of RAM and 32 virtual CPUs
- User invoking the script has passwordless `sudo` capability
-- Hostname is resolvable in DNS, e.g., `dig +short $( hostname )` returns an IP address
```bash
git clone https://gerrit.opencord.org/automation-tools
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).