Added links to readme.md and fixed other stuff.

Resolve confilcts in branch. Copy form PR #52 make by @ruth-mapr Pull Request: Closes #109 Closes #52 Author: jpgilaberte <[email protected]> Date: Wed Apr 18 18:20:25 2018 +0200
apache · Apr 19, 2018 · 0ba2288 · 0ba2288
1 parent 15c6f09
commit 0ba2288
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -10,15 +10,24 @@ The name _Myriad_ means, _countless or extremely great number_. In context of th
 
 ## Getting started
 
-* [How Myriad works](docs/how-it-works.md)
-* [Developing Myriad](docs/myriad-dev.md)
-* [Local vagrant setup guide](docs/vagrant.md)
+* [Overview of Myriad](docs/myriad-overview.md)
+* [How Myriad Works](docs/how-it-works.md)
+    * [Node Manager Profiles](docs/node-manager-profiles.md)
+    * [Myriad Fine-grained Scaling](docs/myriad-fine-grained-scaling.md)
+* [Installation and Configuration](docs/install-overview.md)
+    * [Installing for Developers](docs/myriad-dev.md)
+    * [Installing for Administrators via Tarballs](docs/myriad-remote-distribution-configuration.md)
+    * [Installing using Vagrant](docs/vagrant.md)
+    * [Configuring Cgroups](docs/cgroups.md)
+    * [Configuring for HA](docs/ha-config.md)
+    * [Configuring for JobHistoryServer and Other Services](docs/config-jobhistoryserver-services.md)
+    * [Sample: myriad-config-default.yml](docs/myriad-configuration.md)
+    * [Sample: yarn-site.xml](docs/sample-yarn-site.md)
+* [Getting Started](docs/getting-started.md)
 * [Myriad REST API](docs/API.md)
+* [Deploying the Myriad Resource-Manager using Docker](docker/README.md)
 * [Myriad Dashboard Development](docs/myriad-dashboard.md)
-* [Distribution of Node Manager Binaries](docs/myriad-remote-distribution-configuration.md)
-* [Fine Grained Scaling](docs/myriad-fine-grained-scaling.md)
-* [Deploying the Myriad Resource-Manger using Docker](docker/README.md)
-* [Mesos, YARN and cgroups](docs/cgroups.md)
+
 
 For up-to-date documentation, see [Apache Myriad](https://cwiki.apache.org/confluence/display/MYRIAD/Myriad+Home) on the wiki.
 

diff --git a/docker/README.md b/docker/README.md
@@ -30,8 +30,8 @@ If you need to setup hdfs, consider using the [hdfs-mesos framework](https://git
 In order for the ResourceManager to operate correctly, you will need to provide 5 configuration files. These files will 
 need to mounted from a directory into `/usr/local/hadoo/etc` of the docker container.
 
-* [myriad-config-default.yml](https://github.com/apacher/incubator-myriad/blob/phase1/myriad-scheduler/src/main/resources/myriad-config-default.yml) (template provided)
-* [yarn-site.xml](https://github.com/apache/incubator-myriad/blob/phase1/docs/myriad-dev.md) (template provided)
+* [myriad-config-default.yml](../myriad-scheduler/src/main/resources/myriad-config-default.yml) (template provided)
+* [yarn-site.xml](../docs/samples/yarn-site.xml) (template provided)
 * mapred-site.xml (template provided)
 * hdfs-site.xml (used for hdfs)
 * core-site.xml (used for hdfs)

diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -18,8 +18,8 @@ The ports used by Mesos, Marathon, and Myriad are:
 Application | Port | Syntax |
 ----------------| ------ | ---------- |
 Marathon | 8080 | http://&lt;IP address>:8080 |
-Mesos | 5050 | http://&lt;IP address>:5050. Use the 5050 port and Frameworks directory. For example: http://&lt;IP address>:5050/#/frameworks (http://10.141.141.20:5050/#/frameworks) |
-Myriad | 8192 | http://<IP address>:8192. For example: http://<ip address>:8192/ (http://10.141.141.20:8192/). Without the Mesos-DNS service, this IP is slave node's IP address where the Resource Manager is running. With the Mesos-DNS service, Mesos-DNS discovers the node where the Resource Manager is running by using Mesos DNS FQDN (&lt;app-ID>.&lt;framework>.mesos). |
+Mesos | 5050 | http://&lt;IP address>:5050. Use the 5050 port and Frameworks directory. For example: `http://10.141.141.20:5050/#/frameworks` |
+Myriad | 8192 | http://&lt;IP address>:8192. For example: `http://10.141.141.20:8192`. Without the Mesos-DNS service, this IP is slave node's IP address where the Resource Manager is running. With the Mesos-DNS service, Mesos-DNS discovers the node where the Resource Manager is running by using Mesos DNS FQDN &lt;app-ID>.&lt;framework>.mesos. |
 
 ## Launching Resource Manager ##
 

diff --git a/docs/vagrant.md b/docs/vagrant.md
@@ -19,10 +19,12 @@ At this point the VM will have a single node Mesos cluster running and a single
 HDFS cluster running. You can modify the Mesos and Hadoop versions by editing the
 corresponding variables in the `Vagrantfile`.
 
-Check that Mesos and Hadoop are running with a browser:
+Check that the Mesos master and the Hadoop/HDFS namenode are running with a browser. For example, with the 10.141.141.20 IP address:
 
-[Hadoop/HDFS namenode](http://10.141.141.20:50070)
-[Mesos Master](http://10.141.141.20:5050/)
+```
+http://10.141.141.20:50070     // Hadoop/HDFS namenode
+http://10.141.141.20:5050    // Mesos Master
+```
 
 To ssh in the cluster, run following: