X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=docs%2Foom_setup_kubernetes_rancher.rst;h=767b93925eb2f503f745f2e531c4f0028ff9ccc2;hb=1660a8c5518c45b8a424b15b8c63b71ae0b39c69;hp=67ebca544bee6d2bc6fd9a277c4bbad8b61789b8;hpb=182aa9ea882d44202439f6cd1c9f8b5b1fd4583b;p=oom.git diff --git a/docs/oom_setup_kubernetes_rancher.rst b/docs/oom_setup_kubernetes_rancher.rst index 67ebca544b..767b93925e 100644 --- a/docs/oom_setup_kubernetes_rancher.rst +++ b/docs/oom_setup_kubernetes_rancher.rst @@ -12,7 +12,7 @@ .. _Onboarding and Distributing a Vendor Software Product: https://wiki.onap.org/pages/viewpage.action?pageId=1018474 .. _README.md: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blob;f=kubernetes/README.md -.. figure:: oomLogoV2-medium.png +.. figure:: images/oom_logo/oomLogoV2-medium.png :align: right .. _onap-on-kubernetes-with-rancher: @@ -157,10 +157,10 @@ Assign the key pair that was created/selected previously (e.g. onap_key). Apply customization script for Control Plane VMs ------------------------------------------------ -Click :download:`openstack-k8s-controlnode.sh ` +Click :download:`openstack-k8s-controlnode.sh ` to download the script. -.. literalinclude:: openstack-k8s-controlnode.sh +.. literalinclude:: shell/openstack-k8s-controlnode.sh :language: bash This customization script will: @@ -229,10 +229,10 @@ Assign the key pair that was created/selected previously (e.g. onap_key). Apply customization script for Kubernetes VM(s) ----------------------------------------------- -Click :download:`openstack-k8s-workernode.sh ` to +Click :download:`openstack-k8s-workernode.sh ` to download the script. -.. literalinclude:: openstack-k8s-workernode.sh +.. literalinclude:: shell/openstack-k8s-workernode.sh :language: bash This customization script will: @@ -275,14 +275,22 @@ Install RKE Download and install RKE on a VM, desktop or laptop. Binaries can be found here for Linux and Mac: https://github.com/rancher/rke/releases/tag/v1.0.6 +.. note:: + There are several ways to install RKE. Further parts of this documentation + assumes that you have rke command available. + If you don't know how to install RKE you may follow the below steps: + + * chmod +x ./rke_linux-amd64 + * sudo mv ./rke_linux-amd64 /user/local/bin/rke + RKE requires a *cluster.yml* as input. An example file is show below that describes a Kubernetes cluster that will be mapped onto the OpenStack VMs created earlier in this guide. -Click :download:`cluster.yml ` to download the +Click :download:`cluster.yml ` to download the configuration file. -.. literalinclude:: cluster.yml +.. literalinclude:: yaml/cluster.yml :language: yaml Prepare cluster.yml @@ -357,6 +365,8 @@ Validate deployment :: + > mkdir -p ~/.kube + > cp kube_config_cluster.yml ~/.kube/config.onap > export KUBECONFIG=~/.kube/config.onap @@ -418,7 +428,7 @@ share a common, distributed filesystem. In this tutorial, we will setup an NFS Master, and configure all Worker nodes a Kubernetes cluster to play the role of NFS slaves. -It is recommneded that a separate VM, outside of the kubernetes +It is recommended that a separate VM, outside of the kubernetes cluster, be used. This is to ensure that the NFS Master does not compete for resources with Kubernetes Control Plane or Worker Nodes. @@ -457,10 +467,10 @@ Assign the key pair that was created/selected previously (e.g. onap_key). Apply customization script for NFS Server VM -------------------------------------------- -Click :download:`openstack-nfs-server.sh ` to download +Click :download:`openstack-nfs-server.sh ` to download the script. -.. literalinclude:: openstack-nfs-server.sh +.. literalinclude:: shell/openstack-nfs-server.sh :language: bash This customization script will: @@ -489,15 +499,15 @@ Resulting floating IP assignments in this example. To properly set up an NFS share on Master and Slave nodes, the user can run the scripts below. -Click :download:`master_nfs_node.sh ` to download the +Click :download:`master_nfs_node.sh ` to download the script. -.. literalinclude:: master_nfs_node.sh +.. literalinclude:: shell/master_nfs_node.sh :language: bash -Click :download:`slave_nfs_node.sh ` to download the script. +Click :download:`slave_nfs_node.sh ` to download the script. -.. literalinclude:: slave_nfs_node.sh +.. literalinclude:: shell/slave_nfs_node.sh :language: bash The master_nfs_node.sh script runs in the NFS Master node and needs the list of