diff --git a/README.rst b/README.rst index e8db6106..32cabb66 100644 --- a/README.rst +++ b/README.rst @@ -75,7 +75,7 @@ Manual Installation ^^^^^^^^^^^^^^^^^^^ For a comprehensive manual installation guide, please -see :ref:`dev-getting-started`. +see `Manual Install Guide`_. Usage ^^^^^ @@ -93,8 +93,7 @@ Which should output something like this:: ... For more information on how to install and use Armada, please reference: -:ref:`guide-use-armada`. - +`Armada Quickstart`_. Integration Points ------------------ @@ -114,6 +113,8 @@ Further Reading `Undercloud Platform (UCP) `_. +.. _Manual Install Guide: http://armada-helm.readthedocs.io/en/latest/development/getting-started.html#developer-install-guide +.. _Armada Quickstart: http://armada-helm.readthedocs.io/en/latest/operations/guide-use-armada.html .. _kubectl: https://kubernetes.io/docs/user-guide/kubectl/kubectl_config/ .. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation .. _Deckhand: https://github.com/openstack/deckhand diff --git a/docs/source/development/getting-started.rst b/docs/source/development/getting-started.rst index 1cde54ce..9eecbb2b 100644 --- a/docs/source/development/getting-started.rst +++ b/docs/source/development/getting-started.rst @@ -60,11 +60,7 @@ Armada requires a Kubernetes cluster to be deployed, along with `kubectl`_, #. Install Kubernetes (k8s) and deploy a k8s cluster. - This can be accomplished by cloning the - `k8s repo _` and running - ``kube-up.sh`` in ``kubernetes/cluster``. - - Alternatively, reference the :ref:`k8s-cluster-management` section below. + Reference the :ref:`k8s-cluster-management` section below for help. #. Install and configure `kubectl`_ @@ -272,7 +268,7 @@ included beneath each bullet. $ sudo apt-get install python3-dev -y .. _Bandit: https://github.com/openstack/bandit -.. _kubectl: https://kubernetes.io/docs/user-guide/kubectl/kubectl_config/ +.. _kubectl: https://kubernetes.io/docs/tasks/tools/install-kubectl/ .. _Helm: https://docs.helm.sh/using_helm/#installing-helm .. _Keystone: https://github.com/openstack/keystone .. _Tiller: https://docs.helm.sh/using_helm/#easy-in-cluster-installation