Fix issues in documentation
Change-Id: I3d741b294b04ad347a76e3f8769e3af55890a0f4
diff --git a/config/onlab_develop_pod.yml b/config/onlab_develop_pod.yml
index f095e6c..33ecd86 100644
--- a/config/onlab_develop_pod.yml
+++ b/config/onlab_develop_pod.yml
@@ -22,7 +22,7 @@
# NAT-ed through this interface
fabric_ip: '10.6.1.1/24'
management_ip: '10.6.0.1/24'
- external_ip: '47.135.132.21/24'
+ external_ip: '10.90.0.2/24'
management_iface: 'em2'
external_iface: 'em1'
skipTags:
diff --git a/docs/quickstart_physical.md b/docs/quickstart_physical.md
index 760339f..d88df20 100644
--- a/docs/quickstart_physical.md
+++ b/docs/quickstart_physical.md
@@ -63,7 +63,7 @@
## Clone the Repository
To clone the repository, on your OtP build host issue the `git` command:
```
-git clone http://gerrit.opencord.org/cord
+git clone -b cord-1.0 http://gerrit.opencord.org/cord
```
### Complete
@@ -88,7 +88,8 @@
```
vagrant up corddev
```
-**NOTE:** *It may takes several minutes for the first command `vagrant up
+**NOTE:** *The VM will consume 2G RAM and about 12G disk space. Make sure it can obtain sufficient resources.
+It may takes several minutes for the first command `vagrant up
corddev` to complete as it will include creating the VM as well as downloading
and installing various software packages.*
@@ -238,7 +239,7 @@
images to the target server that are used in the reset of the process, thus
making the head node a self contained deployment.
```
-./gradlew -PdeployConfig=config/podX.yml prime
+./gradlew -PdeployConfig=config/podX.yml -PtargetReg=<head-node-ip-address>:5000 prime
```
### Complete
@@ -246,7 +247,7 @@
step is complete a Docker registry and Docker registry mirror. It can be
verified that these are running by using the `docker ps` command.
```
-docker ps --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}'
+docker ps -a --format 'table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.CreatedAt}}'
CONTAINER ID IMAGE COMMAND CREATED AT
5f1cbebe7e61 registry:2.4.0 "/bin/registry serve " 2016-07-13 17:03:08 +0000 UTC
6d3a911e5323 registry:2.4.0 "/bin/registry serve " 2016-07-13 17:03:08 +0000 UTC
@@ -296,7 +297,7 @@
Canonical MAAS provides the PXE and other bare metal provisioning services for
CORD and will be deployed on the head node.
```
-./gradlew deployBase
+./gradlew -PdeployConfig=config/podX.yml deployBase
```
This task can take some time so be patient. It should complete without errors,
@@ -332,7 +333,7 @@
XOS provides service provisioning and orchestration for the CORD POD. To deploy
XOS to the head node use the following command:
```
-./gradlew deployPlatform
+./gradlew -PdeployConfig=config/podX.yml deployPlatform
```
This task can take some time so be patient. It should complete without errors,
@@ -418,6 +419,10 @@
- `3` - Failed, the provisioning has failed and the `message` will be
populated with the exit message from provisioning.
+Please refer to [Re-provision Compute Nodes and Switches
+](#re-provision-copute-nodes-and-switches)
+if you want to restart this process or re-provision a initialized compute node.
+
## Booting OpenFlow switches
Once the compute nodes have begun their boot process you may also boot the
switches that support the leaf spine fabric. These switches should ONIE install
@@ -463,6 +468,10 @@
- `3` - Failed, the provisioning has failed and the `message` will be
populated with the exit message from provisioning.
+Please refer to [Re-provision Compute Nodes and Switches
+](#re-provision-copute-nodes-and-switches)
+if you want to restart this process or re-provision a initialized switch.
+
## Post Deployment Configuration of XOS / ONOS VTN app
The compute node provisioning process described above (under [Booting Compute Nodes](#booting-compute-nodes))
@@ -673,15 +682,15 @@
- **Replace the DPID of the leaf-spine switches:** The DPIDs are generated by adding 4 extra zeros
in front of the MAC address of the management interface. If a switch has been provisioned
- by MAAS correctly, you should be able to find DPID information in `/root/connect` on the
- head node. Search for the following line:
+ by MAAS correctly, you should be able to find DPID information in `/root/connect` on each switch.
+ Search for the following line:
```
brcm-indigo-ofdpa-ofagent --dpid=0x0000cc37ab6182d2 --controller=$IP
```
Remember to replace "0x" with "of:" . E.g. **of:0000cc37ab6182d2**
- **Modify the MAC address of hosts:** If a compute node has been provisioned by maas correctly,
- you should be able to find out its MAC address by running the following command on the compute node.
+ you should be able to find out its MAC address by running the following command on each compute node.
```
ifconfig fabric | grep HWaddr | awk {'print $5'}
```
@@ -748,3 +757,16 @@
See the [How to Contribute to CORD wiki page](https://wiki.opencord.org/display/CORD/How+to+Contribute+to+CORD#HowtoContributetoCORD-AskingQuestions)
for more information.
+
+## Re-provision Compute Nodes and Switches
+If something goes wrong and you want to reset a provisioned compute node or switch
+
+1. Run the following command on the head node and find the ID of the switch you want to reset
+```
+curl -sS http://$(docker inspect --format '{{.NetworkSettings.Networks.maas_default.IPAddress}}' provisioner):4243/provision/ | jq '[.[] | { "status": .status, "id": .request.Info.id, "name": .request.Info.name}]'
+```
+1. Delete the state on the provisioner
+```
+curl -sS -XDELETE http://$(docker inspect --format '{{.NetworkSettings.Networks.maas_default.IPAddress}}' provisioner):4243/provision/<switch-id>
+```
+1. The provisioner should try to re-provision the compute node/switch automatically.